Merge branch 'master' into v1.0 v1.0.1
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 2 Jun 2014 08:20:46 +0000 (10:20 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 2 Jun 2014 08:20:46 +0000 (10:20 +0200)
commited43f9d461b8c7847a5e2a7d851f912561ba5f50
tree6f35a41fcf7f0d1dd7f1a14ef32edb4b5f67e453
parentea29c12a9d1be011c1026b4a5dc545520fcab6a6
parentd3dff15a6d43860397aaf277eda92073e808a0ca
Merge branch 'master' into v1.0