Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Fri, 23 Nov 2012 08:13:59 +0000 (09:13 +0100)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Fri, 23 Nov 2012 08:13:59 +0000 (09:13 +0100)
commit25385100a53258b85542239849bbf73a9664efb3
treedb50cf7d6b10eb8bc7d0921766efbf995a8a5085
parent3318adb05e17e338d1fc5461547948ace43ac1ba
parent1b43e83a405a9ce2eabab265f3ad5eab6622412d
Merge branch 'next' of gitorious.org:gitorious/mainline into next