merged branch weltling/master (PR #854)
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 4 Oct 2012 17:41:45 +0000 (19:41 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 4 Oct 2012 17:41:45 +0000 (19:41 +0200)
commit515f34abc31ae9109d1d901a8444494672d64d73
tree06e6179d396a15603173cafdd7f0e463bdf9cf59
parent120cde3fa54c31047edf1cd003752ca119dec9a8
parentb013ede1fa88b9d3eeb412716bec527a31d68d53
merged branch weltling/master (PR #854)

This PR was merged into the master branch.

Commits
-------

b013ede fix windows build

Discussion
----------

Trivial fix for windows build