Merge branch 'master' of https://github.com/zk-phi/spray
authorIan Kelling <ian@iankelling.org>
Sun, 6 Jul 2014 09:47:10 +0000 (02:47 -0700)
committerIan Kelling <ian@iankelling.org>
Sun, 6 Jul 2014 09:47:10 +0000 (02:47 -0700)

Trivial merge