Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
commit1a02621abd549527d2eabbe5a4a7115a451ab7fe
authorBastien Guerry <bzg@altern.org>
Tue, 15 Nov 2011 19:00:50 +0000 (15 20:00 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 15 Nov 2011 19:00:50 +0000 (15 20:00 +0100)
treec53410299476dddbfe5085635221813a844ccae3
parentab8d3683cfd8f5ec077eaa3510624e697f925889
parent42e1a29d3859a641fd162d9a8afc48f1d3c20fdd
Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg