From: John Kitchin <jkitchin@andrew.cmu.edu>
Date: Tue, 3 Mar 2015 14:47:25 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/OlafMerkert/org-ref into OlafMerkert... 
X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=commitdiff_plain;h=4f162da7c56aee0d5593d51ded6dada7b316e492;hp=-c

Merge branch 'master' of https://github.com/OlafMerkert/org-ref into OlafMerkert-master
---

4f162da7c56aee0d5593d51ded6dada7b316e492