modified gem
Add audio onebox
http://meta.discourse.org/t/audio-html5-tag/8168
Prevent 'Quote reply' from appearing when using find in Chrome
correct ScreenTrack so it properly flushes everything that happened on stop and resets on start
spec for trashable
improve email styling, include extra respond link
Russian translation (actual version)
Prevent category badges from wrapping on white space
added pt_BR key
Fix 'undefined' in Create Category modal title
Show Edit buttons to staff on categories page again
Merge pull request #1256 from abbat/master

Russian translation (actual version)
Merge pull request #1254 from crob611/master

Prevent 'Quote reply' from appearing when using find in Chrome
Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox

Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
Don't redirect to arbitrary URLs via link tracker
Upgrade Ember to Fix CVE-2013-4170
Remove Discourse.transient. Use a singleton for session data, it's a lot cleaner.
Moved Resolver to new File
Moved Discourse.ajax into a mixin.
Moved highestSeenByTopic to the Discourse.Session