Merge branch 'master' of ssh://git.auf/ongolaboy
authorOngolaboy <willy.manga@auf.org>
Thu, 12 Feb 2015 14:02:18 +0000 (15:02 +0100)
committerOngolaboy <willy.manga@auf.org>
Thu, 12 Feb 2015 14:02:18 +0000 (15:02 +0100)

Trivial merge