Merge commit 'refs/merge-requests/2230' of git://gitorious.org/gitorious/mainline...
authorMatthias Hoermann <hoermann@saltation.de>
Tue, 3 May 2011 14:10:46 +0000 (16:10 +0200)
committerMatthias Hoermann <hoermann@saltation.de>
Tue, 3 May 2011 14:10:46 +0000 (16:10 +0200)
commita64dc9df89fbefcf894d985eeb1661d7ee4810c8
treef65616b80cbda0a5b540f2665130631c15cc74cf
parented87d23dbb786eb2771a6786805ff8f5d7d70f8e
parentc1e52fba9e7c88f1146bb6df1f8b58dff006f45e
Merge commit 'refs/merge-requests/2230' of git://gitorious.org/gitorious/mainline into saltation