Merge pull request #24 from Cyan4973/dev
authorCyan4973 <yann.collet.73@gmail.com>
Thu, 28 Aug 2014 16:43:37 +0000 (18:43 +0200)
committerCyan4973 <yann.collet.73@gmail.com>
Thu, 28 Aug 2014 16:43:37 +0000 (18:43 +0200)
Catch up r122


Trivial merge