Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Tue, 25 Sep 2012 07:14:00 +0000 (09:14 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Tue, 25 Sep 2012 07:14:00 +0000 (09:14 +0200)
commitbcf20d4876873a660d6252db87dbff6d98e43420
treea84dd890f13b2d37e686da895d5cb7c8d1bf57b4
parent1c211958dcbd51eebb87f1389299dc115c8c4af7
parent726b9039aa598375d419a06df7e9e93e54635128
Merge branch 'master' of gitorious.org:gitorious/mainline