Merge branch 'master' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Mon, 14 Feb 2011 14:23:04 +0000 (15:23 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 14 Feb 2011 14:23:04 +0000 (15:23 +0100)
commit2ebf1316b8f5cfe0083f96e5c3c3efc5ea4963b8
tree66d31eece1ad9ffce923ecd4bb64b5acf9dd85c5
parent3e9725760614ae6b7672db0b57cabf0cd387ca69
parentc11d7411277ea4509b2988b695eb173be0ddb711
Merge branch 'master' of gitorious.org:gitorious/mainline