Fix duplicate entries when merges don't conflict.
[enjoyable.git] / Sparkle.framework /
2013-03-11 Joe WreschnigAdd Sparkle automatic updater.