(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
Change 'hg.dwscoalition.org' links to DW's GitHub.
Merge pull request #30 from rickscott/bug5003-remove-hg-links

Bug 5003 - Remove all public-facing refs to hg.dreamwidth.org
(Bug 3505) Don't guess at the timestamp, just use the actual time.
Merge pull request #31 from afuna/suggestions-time-bug3505

(Bug 3505) Don't guess at the timestamp, just use the actual time.
(bug 5006) Updated 500 error page in nonfree
Merge pull request #32 from jeshyr/bug5006

Bug5006
Revert "Bug 1386 - make sure site schemes use different
visited/unvisited link colors"

Color contrast is too low on errorbar

This reverts commit eaadab8fabc4d654ee812d8131f1e209d0f6b31c.
Merge pull request #34 from afuna/revert-bug1386

Revert "Bug 1386 - make sure site schemes use different visited/unvisited link colors"
Revert "(Bug 3505) Don't guess at the timestamp, just use the actual time."

We don't have an entry here yet, usually.

This reverts commit 1531192e0604b47c1fbd3afc6d9a6ab8b6061be3.
Revert "(Bug 3505) Don't guess at the timestamp, just use the actual time."

We don't have an entry yet.

This reverts commit 1531192e0604b47c1fbd3afc6d9a6ab8b6061be3.