Merge commit 'refs/merge-requests/87' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@shortcut.no>
Wed, 18 Aug 2010 08:16:44 +0000 (10:16 +0200)
committerMarius Mathiesen <marius@shortcut.no>
Wed, 18 Aug 2010 08:16:44 +0000 (10:16 +0200)
commitd46ee987c0a78e29987d58385512a7bbb104e515
tree71274c2f6fe09e439c818e3d9a2c1b004b52f477
parentdfd5a9182f7f2b5daadfca8098ed2da51d435498
parent9bb524c58e350c39ce5e90b1e4c2f7a792f9b9e5
Merge commit 'refs/merge-requests/87' of gitorious.org:gitorious/mainline