Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorMarius Mathiesen <marius@gitorious.org>
Fri, 15 Feb 2013 13:20:04 +0000 (14:20 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 15 Feb 2013 13:20:04 +0000 (14:20 +0100)
commit1d7ee1bf1f7661d6411901e9ee8657f329277b07
tree8b5c978d70ea1ab536e574aa6988b39c5a91b917
parent182acf9b0f45fbb116e83ba5d9075c1fdb5ea4ce
parentbbf25a22d9e4240f8e0a1db9e4b028278d3b834a
Merge branch 'next' of gitorious.org:gitorious/mainline into next