20130109
Merge branch 'master' of github.com:eqmcc/doc