Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 29 Mar 2012 13:24:55 +0000 (15:24 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 29 Mar 2012 13:24:55 +0000 (15:24 +0200)
commitbf95f598f207641b850ff5e6728b251ab1ef74a7
treeb3febd222b3d287eac525cae90e1c7201c6cb46e
parent793c5982f71553b51d933172b59ff2b137fca55d
parent05eab34e53b788b6475ac89a0a8be784d2f0235f
Merge branch 'master' of gitorious.org:gitorious/mainline