Merge branch 'master' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Fri, 14 Oct 2011 10:37:40 +0000 (12:37 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 14 Oct 2011 10:37:40 +0000 (12:37 +0200)
commitd6c9e8df6d60a9ffb337bd32747465f87d6ef726
tree32080a791b84eb2c40fe025fedc780f42587bf44
parentf006c905ebfab9c14e2e5f5b8b68d01df900b79d
parent3b7246165cc303d00a4f7e820811e9d61bf20dda
Merge branch 'master' of gitorious.org:gitorious/mainline