Merge branch 'master' into lgpl
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 28 Sep 2013 18:08:52 +0000 (20:08 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 28 Sep 2013 18:08:52 +0000 (20:08 +0200)
commita3d66134a0cf8484b5ac5f0d265c8eb17472ce27
tree878855a5731802cd799d0356e8b3c1894613f961
parentead8db435699a6ac57e36b73b99b34fc1c03b192
parent4fa33e1a6cfaeb914578702849ef3dceaf8cc44b
Merge branch 'master' into lgpl