Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
commit36b1fc00c41c3f6e7259beae089e438d407ca500
authorBastien Guerry <bzg@altern.org>
Sun, 27 Nov 2011 10:08:19 +0000 (27 11:08 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 27 Nov 2011 10:08:19 +0000 (27 11:08 +0100)
treec1b7fbf5ab76c5c683ae62e02906bd76169e2164
parenta0d3bc6ebe4addb9c0a34474877b59c88400af47
parentcee474db3d0626353e3cb1833d59db85e83b0522
Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg