20141128_02:20:06 from
Merge branch 'master' of https://github.com/Nymphium/settings