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)

Trivial merge