[charmod-norm] new commits pushed by aphillips

The following commits were just pushed by aphillips to 
https://github.com/w3c/charmod-norm:

* Changes in response to comments by JcK as detailed here:

   
https://lists.w3.org/Archives/Member/member-i18n-core/2015Jun/0006.html
  by @aphillips
https://github.com/w3c/charmod-norm/commit/e633961bbaeac154d101547ec40a5749bb4c9faf

* Rebased and merged changes from w3c to aphillips copy
  by @aphillips
https://github.com/w3c/charmod-norm/commit/109b6193e60406a45d8f3289e5480f54efef4710

* Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
  by @aphillips
https://github.com/w3c/charmod-norm/commit/4e11e6d2eab65cdebfff2e18495c8ea9d59ab366

* Merge Richard's version to my fork, resolving conflicts.

Conflicts:
        index.html
  by @aphillips
https://github.com/w3c/charmod-norm/commit/7f94f7ae9598c10411a5c85eca0f9062875fa17e

* Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
        index.html
  by @aphillips
https://github.com/w3c/charmod-norm/commit/296f69da167dd89068d644efe505862aa850c19c

* Merge pull request #16 from aphillips/gh-pages

Merge my fork, with minor cleanups, back to W3C copy
  by aphillips
https://github.com/w3c/charmod-norm/commit/81aa56192bc5b29c6d6984dea9dfc832a981ccac

Received on Saturday, 8 August 2015 17:03:27 UTC