sourcegraph/srclib — pull request #83 by xizhao (2014-12-03 21:10:00+00:00)
Title: Merge pull request #1 from sourcegraph/master

catch up to master