dos2unix
Make stripping and condensing optional.
Use from_work_dir instead of copying output files line by line. Write velvetg output to stdout.
Add Graph2 output dataset when "-read_trkg yes".
Remove whitespace from the beginning and end of individual lines in a <command> tag before assembling it into a single line.
Update job time output in admin manage jobs to prevent rollover when time surpasses 24 hours
Update and fix the version of node-http-proxy used by dynamic proxy.
Upgrade with:

% cd lib/galaxy/web/proxy/js
% npm install

Hoping to fix problems encountered by Bjoern or at least eliminate differences in our respective environments.
Merged in nsoranzo/galaxy-central (pull request #543)

Enhancements to "Convert delimiters" and "velvetg" tools.
Merged in ericenns/galaxy-central (pull request #546)

Update admin manage jobs time calculation
Another fix like PR 546.
API: Return also metrics for jobs when full=True and user is admin.
Handle all submission failures in the drmaa runner.
Patch from Eric Rasche, redacting a few things from sentry reports.
Create the tool_data_table_conf.xml file if it doesn't exist
Merge with upstream changes.
Merge.
changes to account updates: added javascript valdiation of username and email changes; user account will be deactivated if you change an email address and you have to activate it once again
Fix: regenerate dataset-model urls on fetch even when silent
Merge default
gremmar