Merge branch 'hotfix/issue-138' into next
authorMarius Mathiesen <marius@gitorious.org>
Fri, 16 Nov 2012 07:25:15 +0000 (08:25 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 16 Nov 2012 07:25:15 +0000 (08:25 +0100)
commit1b43e83a405a9ce2eabab265f3ad5eab6622412d
tree9ced47bc40b86d848d5e5999854b3eb6fddd1638
parent30322a24dad09562380cb7ebceb46ad7d6f09727
parent6e40dda747fb7074888c6c3f69fcbfd72ac339ef
Merge branch 'hotfix/issue-138' into next