Merge branch 'hotfix/fix_migration'
authorMarius Mathiesen <marius@gitorious.org>
Wed, 31 Oct 2012 12:45:55 +0000 (13:45 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Wed, 31 Oct 2012 12:45:55 +0000 (13:45 +0100)
commitcc2c283c53e8d56390aa6ba1648f4f7923e94532
treef637bed62d853c89ef230d23aa53743b7392e9c3
parent347169f20e7c3cbffca9ed0f798c4c579b56681d
parent368c1105f30b1a0ecd23136c95c4a4e982d919f5
Merge branch 'hotfix/fix_migration'