Merge commit 'refs/merge-requests/195' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Fri, 10 Feb 2012 09:58:39 +0000 (10:58 +0100)
committerChristian Johansen <christian@gitorious.org>
Fri, 10 Feb 2012 09:58:39 +0000 (10:58 +0100)
commite98c09ee7fe889f912609642ff201de834bfa0d4
tree9dcc589b92bed71bff5227d94937e2e1e96717ba
parent23b8fa166f8756bc2e6733ff4d90a5ea08cb58c6
parent8b9f388b670b50ddcf248448f35b55a142f2dc66
Merge commit 'refs/merge-requests/195' of gitorious.org:gitorious/mainline