Merge branch 'master' of ssh://repo.or.cz/srv/git/girocco
commit88f5debc8a9fbb796fbd00620a80e3b2db96663f
authorAndrew Steinborn <g33kdyoo@gmail.com>
Sun, 12 Sep 2010 18:10:32 +0000 (12 14:10 -0400)
committerAndrew Steinborn <g33kdyoo@gmail.com>
Sun, 12 Sep 2010 18:10:32 +0000 (12 14:10 -0400)
treede9bfe519a102cf09df46d70102482ff8c2ebe08
parent08ef5f1bd7fd8dffab40dbab49d1b23a6b9174b4
parentf32750a7d8d3385641243a60aa3e379c80572163
Merge branch 'master' of ssh://repo.or.cz/srv/git/girocco