Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 15 Jun 2011 21:25:47 +0000 (23:25 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 15 Jun 2011 21:25:47 +0000 (23:25 +0200)
commitbb770e295cd727429df524b0a5c3952ea449fdb2
treee8a894c2a75e7ff53946b05508f82b501c37189e
parentbb10e5bef7ae062424b4c334a73c4ce988e37ccf
parent0e9dd2a28669a4d42c4a3828dbd047937acd776c
Merge remote-tracking branch 'gitorious/master'