Merge branch 'master' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Fri, 28 Sep 2012 12:52:02 +0000 (14:52 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 28 Sep 2012 12:52:02 +0000 (14:52 +0200)
commit0083eda17bf91760a72af7df58b80fb84f540795
treee9c4dd537c2e12d933a9e9cae09f7486c389c80d
parent62b132cb0ae65bdbcfcdbf7f12f804239f6c0570
parentf890bb85a3bbf3898233666b71500b3a0dbc8f4f
Merge branch 'master' of gitorious.org:gitorious/mainline