Merge branch 'master' into 1.0
[dcpomatic.git] / run / alignomatic
2012-07-14 Carl HetheringtonMove things round a bit.