Merge branch 'release-1.11.0' into develop
(Bug 647) Tweaks for heirarchical display coloring in Tropo
Merge pull request #13 from momijizukamori/release-1.11.0

(Bug 647) Tweaks for heirarchical display coloring in Tropo
(Bug 647) Fix heirachical display in Tropo Red and Purple
Merge pull request #14 from momijizukamori/release-1.11.0

(Bug 647) Fix hierarchical display in Tropo Red and Purple
Bug 4717 - Core2: use get_plural_phrase for visible count and expose visible/screened props
http://bugs.dwscoalition.org/show_bug.cgi?id=4717
-- Expose text_read_comments_screened_visible and text_read_comments_screened in nonfree styles
(Bug 4702) Add styling to comment page list box
(Bug 4677) Add using font_sources to Transmogrified and Sunday Morning
(Bug 4711) Comment Posted message styling for non-free layouts
Merge pull request #15 from ninetyd/bug4717/core2_visible_screened_update_nf

Bug 4717 - Core2: use get_plural_phrase for visible count and expose vis...
Merge pull request #16 from momijizukamori/Bug4702/S2CommentNav

(Bug 4702) Add styling to comment page list box
Merge pull request #17 from momijizukamori/Bug4677/font_sources

(Bug 4677) Add using font_sources to Transmogrified and Sunday Morning
(Bug 4742) Turn on Anniversary Promo for December 2012
Merge branch 'release-1.11.0' into develop

* release-1.11.0:
  (Bug 4742) Turn on Anniversary Promo for December 2012
  (Bug 647) Fix heirachical display in Tropo Red and Purple
  (Bug 647) Tweaks for heirarchical display coloring in Tropo
Merge pull request #18 from momijizukamori/Bug4711/S2CommentPosted

Bug4711/s2 comment posted
(Bug 4775) Don't show promo text on receipts

Do show it when confirming a check/money order.

Ideally, we could check if the promo was active when the cart payment
was processed, but that's not an easy thing right now. So instead of
showing it always on all receipts when the promo period is active, just
don't show it on any receipt at all.
Merge pull request #20 from afuna/promo-text-bug4775

(Bug 4775) Don't show promo text on receipts
Merge branch 'release-1.12' into develop

* release-1.12:
  (Bug 4775) Don't show promo text on receipts
Merge branch 'develop'

* develop:
  (Bug 4775) Don't show promo text on receipts
  (Bug 4742) Turn on Anniversary Promo for December 2012
  (Bug 4711) Comment Posted message styling for non-free layouts
  (Bug 4677) Add using font_sources to Transmogrified and Sunday Morning
  (Bug 4702) Add styling to comment page list box
  Bug 4717 - Core2: use get_plural_phrase for visible count and expose visible/screened props http://bugs.dwscoalition.org/show_bug.cgi?id=4717 -- Expose text_read_comments_screened_visible and text_read_comments_screened in nonfree styles
  (Bug 647) Fix heirachical display in Tropo Red and Purple
  (Bug 647) Tweaks for heirarchical display coloring in Tropo