Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
commitc1362db3f8c401fc4da6e95f79b60b89d0400e21
authorBastien Guerry <bzg@altern.org>
Thu, 18 Aug 2011 16:43:03 +0000 (18 18:43 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 18 Aug 2011 16:43:03 +0000 (18 18:43 +0200)
tree07dc4d4f2db1e3afda0014638d9fbd14a8c22884
parenta1edc3974dc66483a9a992a7c23d208d0f94b5c4
parentca385f31ea4fc8d3120523070305fd106623c0c1
Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg