[fix bug 1037698] Screenshots of Marketplace on /firefox/os/ are out of date
Remove DeprecationWarning about BaseException.message
Merge pull request #2177 from jgmize/remove-deprecated-message

Remove DeprecationWarning about BaseException.message
Add templates for /about/forums port for Bug 896474
Bug 896474: Generate forums from data file in SVN.
Output forum list with simpler markup Bug 896474
Revert Webmaker promo. Bug 1042126.

- New Webmaker promo markup/CSS/images left in repo for
  probable future use.
Merge pull request #2178 from jpetto/bug-1042126-revert-webmaker-promo

Revert Webmaker promo. Bug 1042126.
Merge pull request #2160 from mozilla/port-forums-new-896474

Bug Bug 896474: Port /about/forums
[fix bug 1043424] Add email signup form box to /whatsnew page
[fix bug 1040719] Stop redirecting Firefox Nightly First Run pages to Mozilla Taiwan website
Merge pull request #2182 from alexgibson/bug-1040719-firefox-nightly-firstrun-mozilla-taiwan

[fix bug 1040719] Stop redirecting Firefox Nightly First Run pages to Mozilla Taiwan website
Add a link to file a bug in bugzilla to README
[fix bug 1040213] Poster images for HTML5 videos don't appear in IE9
[fix bug 1045711] Adjust extra menu highlight call when starting Firefox tour
Add chief deploy script for www-dev.
Merge pull request #2184 from pmclanahan/master

Add chief deploy script for www-dev.
Bug 1040970 - Create 301 direct on mozilla.org that points to careers info on wiki
Bug 1043366 - Add Berlin office twitter, irc and wiki info
Merge pull request #2187 from retornam/fix-berlin

Bug 1043366 - Add Berlin office twitter, irc and wiki info