Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Tue, 21 Jun 2011 17:13:07 +0000 (19:13 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Tue, 21 Jun 2011 17:13:07 +0000 (19:13 +0200)
commit3efb0848096e00b1d7a82a62b717289efafc95fa
tree870f494aec6b3faffebee9a0f2d6c87af23fd7ef
parent4e5a55787ba16c06944ab63afa3642070b2a7b14
parentf439193628d4ed41f109ca1bdce6bc7ac2287f09
Merge remote-tracking branch 'gitorious/master'