Merge branch 'master' into temporary branch debian
authorSophie Brun <sophie@freexian.com>
Fri, 30 Jan 2015 10:10:15 +0000 (11:10 +0100)
committerSophie Brun <sophie@freexian.com>
Fri, 30 Jan 2015 10:10:15 +0000 (11:10 +0100)
commit5ac2271851e3f0b59c25bfd9393596c0856aab28
treee66572dfe17a10bba575f37958f59688bc099ffe
parentabaf29e0933c0eaa248c9f0acd0474fb89e23b37
parent3b8ab06e35d1be177a02827cf4c4dbd97e7c6f97
Merge branch 'master' into temporary branch debian