Merge commit 'refs/merge-requests/5' of git://gitorious.org/+saltation-developer...
authorBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:07:10 +0000 (15:07 +0200)
committerBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:07:10 +0000 (15:07 +0200)
commit8aaf4cbb2f5991acb3fb4b4103fc5fe454fc0f6a
tree1ddf9368cd1bc70a25b633103bdef9e26ce811b6
parentbf2a2fc864f4fcf98b546d2eb2b9d0e62beb0c3f
parent40e55f5244cd21e86be6d37deda12a9541bb5ea7
Merge commit 'refs/merge-requests/5' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation