Merge branch 'hotfix/fix_migration' into next
authorMarius Mathiesen <marius@gitorious.org>
Wed, 31 Oct 2012 12:46:12 +0000 (13:46 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Wed, 31 Oct 2012 12:46:12 +0000 (13:46 +0100)
commitd0b859bcffd6b24170f1d977ac3fa59102657de3
tree247411d7c361bcef92cab2c80b8216ec4e6cf05f
parent066e7062d9c36aa8cf476a2421d6e21b16207a4c
parent368c1105f30b1a0ecd23136c95c4a4e982d919f5
Merge branch 'hotfix/fix_migration' into next