brooklyncentral/brooklyn — pull request #1291 by ahgittin (2014-03-28 14:29:01+00:00)
Title: Fixing sameserver

fix trivial merge conflicts from #1275