Merge commit 'refs/merge-requests/2252' of gitorious.org:gitorious/mainline into...
authorChristian Johansen <christian@gitorious.com>
Fri, 15 Feb 2013 13:59:12 +0000 (14:59 +0100)
committerChristian Johansen <christian@gitorious.com>
Fri, 15 Feb 2013 13:59:12 +0000 (14:59 +0100)
commit7505d03f3894120c07236aa17b537c3352a1eba8
tree8cb9821808e896d017dd3170c9e3ca2f6c4ef784
parent03388c9ae22bcd08c8d987fe317ab3ff9aee2ced
parent5584e3efe90ee13acb2e829cefc18ef56adfc63f
Merge commit 'refs/merge-requests/2252' of gitorious.org:gitorious/mainline into merge-requests/2252