twitter/finagle — pull request #326 by nshkrob (2014-12-12 20:30:29+00:00)
Title: Merge rebased develop onto master

This merges https://github.com/twitter/finagle/pull/325 into master.

git checkout develop

git rebase master
git merge origin/develop # No diffs here, just merge history.

git checkout master
git merge develop # Unifies history