Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
authorBastien Guerry <bzg@altern.org>
Fri, 11 Nov 2011 07:12:08 +0000 (08:12 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 11 Nov 2011 07:12:08 +0000 (08:12 +0100)
commitd588afe10a5a930a1158db20319465c3214b228a
treea13dd38453928e0f8354ffb23e4a568bf968f7aa
parent84cc995f1c8fb635fd97552cc79a732dd6503eec
parentb0e13ea618a3b22ee4b3e47c4b25434e247a9689
Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg