RichiH/conference_proceedings — pull request #15 by Millak (2014-01-09 14:38:58+00:00)
Title: Added debian 2011/2012, LCA2012/2013

I realize now that I haven't changed the .html files to .md files yet. Also, Linux Conference Australia is currently running and uploading videos at the same time, so I've added it to my local annex but haven't pushed it to Millak/master yet. If I were smart I'd make it a separate branch, but for now I'm just rebasing around it.