Merge commit 'refs/merge-requests/172' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Fri, 30 Sep 2011 12:25:47 +0000 (14:25 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 30 Sep 2011 12:25:47 +0000 (14:25 +0200)
commit279f7d6fab727cf1a53d8d4de05f610cb2a68219
tree1f59ac10bf815691f9d5e7e49478ddc09c677714
parent334be24ed94cdc408fe8c246b6889af43022faf8
parent56e4105dbae95e2256d3849a76e3486b2801151f
Merge commit 'refs/merge-requests/172' of gitorious.org:gitorious/mainline