Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
commita0d3bc6ebe4addb9c0a34474877b59c88400af47
authorBastien Guerry <bzg@altern.org>
Wed, 23 Nov 2011 22:37:45 +0000 (23 23:37 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Nov 2011 22:37:45 +0000 (23 23:37 +0100)
tree5bc5d0503b76902d1d2e88fd7114ec4e93757e26
parent81c2ad6230d168dbf2c3f8549d45bc0e19086997
parent6a8493d58eb606f408eb91360b96b1d985e55a22
Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg