let other components know when user needs to accept T&C
(Issue 3386) Add alert-warning for etherpad content alerts
Make etherpad warning style consistent with unembeddable link warning
(Issue 3396) lhnav share popup now has smaller width
(Issue 3396) Only shrink share popup for 480px or less
Wrap tenant hostname
Follow-up on review
Merge remote-tracking branch 'bert/bootstrap3' into issue-3386
Align etherpad warning text in the center
(Issue 3388) Always collapse the compressed lhnav when a menu item is selected
(Issue 3388) Fix outdated comment
master and tenant google analytics
ignore tenant tracking if same id as master
(Release 4.2.1) Bump version
Merge pull request #3409 from sathomas/termsandconditions

Terms and conditions doesn't indicate re-accepting is required
Travis CI: Fetch nginx ppa from launchpad, use hosts addon
Remove nginx ppa from Travis file
Merge pull request #3544 from bp323/travisFix

Fix travis build
Point Travis to irc.freenode.org#oae
Synchronized translations