From: John Kitchin <jkitchin@andrew.cmu.edu>
Date: Wed, 25 Mar 2015 13:31:42 +0000 (-0400)
Subject: Merge branch 'master' of github.com:jkitchin/org-ref
X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=commitdiff_plain;h=f6a6ac450ac52f98255ef184800775a2163414b7

Merge branch 'master' of github.com:jkitchin/org-ref
---

f6a6ac450ac52f98255ef184800775a2163414b7