Merge branch 'staging' of /home/carl/git/dvdomatic into staging
[dcpomatic.git] / dvdomatic.desktop.in
2012-07-14 Carl HetheringtonMove things round a bit.