(Bug 2046) Update PauAmma's bio
(Bug 2046) Updated Afuna's bio
Merge pull request #26 from afuna/staff-bug2046

Update more bio
(bug 4897) Nonfree version of new hook for CC warning

the hook is called in the dw-free patch accompanying. THIS IS NOT
TESTED, since my 'hack isn't set up to do payments, so it may not work
or the formatting may be weird!
Merge pull request #27 from rahaeli/bug4897-nf

(bug 4897) Nonfree version of new hook for CC warning
Merge branch 'release-1.14' into develop

* release-1.14:
  (Bug 2046) Updated Afuna's bio
  (Bug 2046) Update PauAmma's bio
Bug 1386 - make sure site schemes use different visited/unvisited link colors
http://bugs.dwscoalition.org/show_bug.cgi?id=1386
-- Switch hover and visited link color to muted purple and brighter purple
Merge pull request #28 from ninetyd/bug1386/tropo_purple_colors

Bug 1386 - make sure site schemes use different visited/unvisited link c...
Bug 4987 - dmca policy should be explicitly cc-by-sa
http://bugs.dwscoalition.org/show_bug.cgi?id=4987
-- add licensing terms to dmca policy
Merge pull request #29 from ninetyd/bug4987/dmca_license

Bug 4987 - dmca policy should be explicitly cc-by-sa