sndnvaps/loki — pull request #1 by sndnvaps (2014-03-25 11:11:40+00:00)
Title: Merge djrbliss:master into refs/heads/master

update upstream into branch