Merge branch 'master' of ssh://doumenc.org/home/web/sites/git/config
authorBen Doumenc <bdoumenc@gmail.com>
Sat, 13 Jul 2013 12:31:34 +0000 (14:31 +0200)
committerBen Doumenc <bdoumenc@gmail.com>
Sat, 13 Jul 2013 12:31:34 +0000 (14:31 +0200)

Trivial merge