(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.
Merge branch 'release-1.15' into develop

* release-1.15:
  Revert "(Bug 3505) Don't guess at the timestamp, just use the actual time."
  Revert "Bug 1386 - make sure site schemes use different visited/unvisited link colors"
(Bug 3505) Base the timestamp of the admin post on remote's tz

To make keeping track of entries easier.
Merge pull request #35 from afuna/suggestions-timestamp-bug3505

(Bug 3505) Base the timestamp of the admin post on remote's tz
(Bug 1763) Remove obsolete CSS
Merge pull request #36 from momijizukamori/Bug1763/CreditModule

(Bug 1763) Remove obsolete CSS
(bug 4726) move styles to /bin/styles
-- move all files from /bin/upgrading/s2layers to /bin/styles
-- also move s2layers.dat to /bin/styles
Merge pull request #37 from ninetyd/bug4726/move_s2layers_nf

(bug 4726) move styles to /bin/styles
(bug4726) move /bin/styles to /styles
-- wha it says on the tin
Merge pull request #38 from ninetyd/bug4726/move_/bin/styles_nf

(bug4726) move /bin/styles to /styles