Merge commit 'refs/merge-requests/2256' of git://gitorious.org/gitorious/mainline...
authorChristian Johansen <christian@gitorious.com>
Mon, 8 Apr 2013 20:20:52 +0000 (22:20 +0200)
committerChristian Johansen <christian@gitorious.com>
Mon, 8 Apr 2013 20:20:52 +0000 (22:20 +0200)
commit0971538fef1de2e18f48b178bfe6037765de86d8
tree71f841a5cea833bb5ca13bffc061f2b1a661938a
parent660f4990dc6918abccf3b44226a47cd407a6f324
parentbcd0230abff4b11f1b22a0db22bcbaa587fd2ba3
Merge commit 'refs/merge-requests/2256' of git://gitorious.org/gitorious/mainline into next