Merge commit 'refs/merge-requests/4' of git://gitorious.org/+saltation-developer...
authorBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:06:41 +0000 (15:06 +0200)
committerBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:06:41 +0000 (15:06 +0200)
commitbf2a2fc864f4fcf98b546d2eb2b9d0e62beb0c3f
treedaa30e7f4a6833145423fee427e961513c4b496b
parentae844aed197ae766f45f6f06ef7f993577d59a14
parent6ffbc6241acbff4ca5442ac18f2928f438b3c047
Merge commit 'refs/merge-requests/4' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation