Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Sat, 18 Jun 2011 23:44:26 +0000 (01:44 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Sat, 18 Jun 2011 23:44:26 +0000 (01:44 +0200)
commit76e21adbd8756159d83bef99b335398519b338f3
tree3c8c6b179cea2fa2ba70dc039ef2c0f63ab09a98
parentd81b39da4c0f67b5f1c02da31f2c671aaca39624
parentf2f3fe33e90ae7bc2f621bbd3cb003e098d130c8
Merge remote-tracking branch 'gitorious/master'