tgstation/-tg-station — pull request #6644 by Carn (2014-12-28 23:11:04+00:00)
Title: Please avoid merging stuff which would conflict with this. [donotmerge]

some recent merges were lost due to entire conflicting files. I did ask nicely.