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)
commit5d41f878f2b79d15ebeea0e573120858ff3883d6
tree741097ad77d80286f8af607189440f04b3584022
parent3108eef8100c26d045275ab0ec9116a33c7f873a
parentbb902d803e4e493ee933e8a1acb9ff8a8fcffddb
Merge pull request #24 from Cyan4973/dev

Catch up r122