Merge branch 'feature/windows_support' into develop
authorTomás Touceda <chiiph@leap.se>
Thu, 28 Nov 2013 20:25:39 +0000 (17:25 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 28 Nov 2013 20:25:39 +0000 (17:25 -0300)

Trivial merge