Merge commit 'refs/merge-requests/2' of git://gitorious.org/+saltation-developer...
authorBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:01:21 +0000 (15:01 +0200)
committerBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:01:21 +0000 (15:01 +0200)
commit87b13c204cfb1860d5122b03120401268fe4adb9
treeca57779631720053fb04dff91afcdd6831db3659
parenta5e4d9d7dbbcefbcd70c1f2a808c7a7ed01045b8
parent4490f728bc2ce04f2985085086d2bba9d572709f
Merge commit 'refs/merge-requests/2' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation