Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Mon, 6 Jun 2011 19:26:58 +0000 (21:26 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Mon, 6 Jun 2011 19:26:58 +0000 (21:26 +0200)
commit9c50d0c6989b03979ee97f2b39de4a18937b73e6
tree987eb354788668b26296c5c736469b3b450295c3
parentec8f66bd650e580eae67ad97fbc81776365d84f2
parentfe4ffb860fcf211406861a726c64439435964f4c
Merge remote-tracking branch 'gitorious/master'