Merge branch 'master' of ssh://git.popipo.fr/~benoit/gps
authorBenoit Papillault <benoit.papillault@free.fr>
Tue, 27 Dec 2011 08:42:32 +0000 (09:42 +0100)
committerBenoit Papillault <benoit.papillault@free.fr>
Tue, 27 Dec 2011 08:42:32 +0000 (09:42 +0100)

Trivial merge