Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 22 Jun 2011 15:01:20 +0000 (17:01 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 22 Jun 2011 15:01:20 +0000 (17:01 +0200)
commit7f8a70ef25a36561042b34afba899ecf37aacfdc
treefa8e757b705b763e2c848077704ad88863d4e959
parent69a303a84ce3bc18e4e5a745a07a720fb7b0c73e
parentcf383901a960897b92d05bd04b88d688920c6ef7
Merge remote-tracking branch 'gitorious/master'