Merge commit 'refs/merge-requests/2212' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Tue, 25 Jan 2011 14:21:49 +0000 (15:21 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Tue, 25 Jan 2011 14:21:49 +0000 (15:21 +0100)
commitf23e7873051b0c80a549ab3a6a885510fc2f3c61
tree5caba75d45e76e8045bbe0155c8c245f0769205b
parent60482ab314255d7302e6a24c3f0de509034bbf0a
parent86f1b85edc7cad8eb5aabba58840c6c1544ad5e7
Merge commit 'refs/merge-requests/2212' of gitorious.org:gitorious/mainline