Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Fri, 28 Sep 2012 11:45:22 +0000 (13:45 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Fri, 28 Sep 2012 11:45:22 +0000 (13:45 +0200)
commitf890bb85a3bbf3898233666b71500b3a0dbc8f4f
treec5f53f2c5237bc9db5ea46bca0411fe96e3a11d1
parent812dd598929f456088d1472cccb86b7e21e5f628
parent31d4d80a3dfcc40b04be92a7dd7ea8a659a1ed2a
Merge branch 'master' of gitorious.org:gitorious/mainline