Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Wed, 30 Jan 2013 13:02:24 +0000 (14:02 +0100)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Wed, 30 Jan 2013 13:02:24 +0000 (14:02 +0100)
commitbad48559b0c7d3ef00536477c0ad14413dfef26d
tree730cb9ee5a6f9b333c13846d301cf0f6b8949a32
parent7891bfcc0c685254b1f85cb5fea76b55128287de
parent86bc2363e67672bba4fc277db1db653755405eed
Merge branch 'next' of gitorious.org:gitorious/mainline into next