Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Sat, 4 Jun 2011 00:22:09 +0000 (02:22 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Sat, 4 Jun 2011 00:22:09 +0000 (02:22 +0200)
commitf4b2bd93f2f9c0f5fbef5214b2fe97912857b175
tree1a83f2b7a82d10a1a8f795f5f9876cf5ba5ad269
parent2165d464a4aed262deeb7b8b0a3fc283c7adc326
parentc042bc6e218e99f93c1e642b1d77839ca0f4b1f9
Merge remote-tracking branch 'gitorious/master'