Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorMarius Mathiesen <marius@gitorious.org>
Fri, 15 Feb 2013 13:09:38 +0000 (14:09 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 15 Feb 2013 13:09:38 +0000 (14:09 +0100)
commit74d15ca8f68da99726a2e26135f18a7428ccf758
tree41d280cdb16a3a162eed8912551e8c1851bc6d9e
parent2f98fec06b60ced75ed0c95998dc02f62baeab75
parent3b2be5d4fcf887dd7ebeddc92239b510f400e9c4
Merge branch 'next' of gitorious.org:gitorious/mainline into next