Merge branch 'master' of ssh://doumenc.org/home/web/sites/git/config
authorBenjamin Doumenc <big.clop@gmail.com>
Wed, 19 Jun 2013 09:31:30 +0000 (11:31 +0200)
committerBenjamin Doumenc <big.clop@gmail.com>
Wed, 19 Jun 2013 09:31:30 +0000 (11:31 +0200)

Trivial merge