Merge remote-tracking branch 'origin' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:07:48 +0000 (18:07 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:07:48 +0000 (18:07 +0200)
commitade8d80ab4e09cebf2ce38d039fa6a5a400c09cf
tree60dc24850ec3d4614c7178d21111920fbfd076ff
parentb334e64586b01449d33f2fa2ed727918d211457f
parent90e00992c86ca4e410dcd2a725daad9dee2a4e39
Merge remote-tracking branch 'origin' into v0.8