Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Mon, 6 Jun 2011 12:46:56 +0000 (14:46 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Mon, 6 Jun 2011 12:46:56 +0000 (14:46 +0200)
commitec8f66bd650e580eae67ad97fbc81776365d84f2
tree499c0c5ef2868c8f3de724133a9f468122c79589
parentf4b2bd93f2f9c0f5fbef5214b2fe97912857b175
parent3aa4c668b9bfe53ed58d4ae21ed91210df7ad9ff
Merge remote-tracking branch 'gitorious/master'