neerc 2012
Merge branch 'master' of https://github.com/ACM-Obsidian/Obsidian