Merge commit 'refs/merge-requests/127' of gitorious.org:gitorious/mainline into merge...
authorMarius Mathiesen <marius@shortcut.no>
Thu, 14 Oct 2010 11:37:55 +0000 (13:37 +0200)
committerMarius Mathiesen <marius@shortcut.no>
Thu, 14 Oct 2010 11:37:55 +0000 (13:37 +0200)
commit593e773f0b0ebb9fb68c9675abc4178289842275
tree79f1c621b0c12f28d70439494e5118486cb9bd12
parent538c113a51c668c61d7cad34959175edb522edfe
parent8733733f0d6cf17739bfb3c90ac99749284bbe6b
Merge commit 'refs/merge-requests/127' of gitorious.org:gitorious/mainline into merge-requests/127