Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 22 Jun 2011 13:32:06 +0000 (15:32 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 22 Jun 2011 13:32:06 +0000 (15:32 +0200)
commit69a303a84ce3bc18e4e5a745a07a720fb7b0c73e
treeb3938072b21f05ea3b40f315d68ab91cd639e535
parent3efb0848096e00b1d7a82a62b717289efafc95fa
parentd220f87c120e4c8627a80adaa6fab18ebe85669f
Merge remote-tracking branch 'gitorious/master'