Merge branch 'msvc-for-1.11' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 9 Dec 2011 12:03:01 +0000 (13:03 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 9 Dec 2011 12:03:01 +0000 (13:03 +0100)

Trivial merge