Merge branch 'hotfix/issue-138'
authorMarius Mathiesen <marius@gitorious.org>
Fri, 16 Nov 2012 07:25:01 +0000 (08:25 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 16 Nov 2012 07:25:01 +0000 (08:25 +0100)
commitb4d2bc5c807213b75a79ca378fb96d1fe5219223
treec1f0ea28a5fa9b1f9a78cb264bf15f67e262f6d8
parentcc2c283c53e8d56390aa6ba1648f4f7923e94532
parent6e40dda747fb7074888c6c3f69fcbfd72ac339ef
Merge branch 'hotfix/issue-138'