Merge commit 'refs/merge-requests/6' of git://gitorious.org/+saltation-developer...
authorBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:07:35 +0000 (15:07 +0200)
committerBjörn Steinbrink <steinbrink@saltation.de>
Tue, 7 Jun 2011 13:07:35 +0000 (15:07 +0200)
commitfa59bd20fc2ef0ec9acf79226fc8bf60a71a9974
tree65681ea584d2b698a9eb5fa5fc7330903084fa89
parent8aaf4cbb2f5991acb3fb4b4103fc5fe454fc0f6a
parent197b7c8e372b6b6efc54a7dc8d6c76eb389a1a97
Merge commit 'refs/merge-requests/6' of git://gitorious.org/+saltation-developer/gitorious/gitorious-saltation into saltation