Updated MAINTAINERS back to me
Merge branch 'master' of git://yorba.org/shotwell