merge with master
[apps/core/preloaded/myfiles.git] / NOTICE
2013-03-15 Jinkun Jangmerge with master