Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Fri, 3 Jun 2011 19:51:38 +0000 (21:51 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Fri, 3 Jun 2011 19:51:38 +0000 (21:51 +0200)
commit2165d464a4aed262deeb7b8b0a3fc283c7adc326
tree63ce8c74e7ad279de66c232c2d623ea22a1d3b2a
parent3e965450953e643afa9252feedb60f3a4c849c9d
parent02d80437d1cdda5b2a8596d024aafa8b286cb360
Merge remote-tracking branch 'gitorious/master'