Merge branch 'master' into format-fix
[dcpomatic.git] / dvdomatic.desktop.in
2012-07-14 Carl HetheringtonMove things round a bit.