Commit graph

2 commits

Author SHA1 Message Date
Simon Cruanes
4e49e2a893 Merge branch 'master' into stable 2015-07-16 11:28:19 +02:00
Simon Cruanes
a8f5c3420f merge from master for 0.7 2014-12-19 20:23:13 +01:00