From: John Kitchin <jkitchin@andrew.cmu.edu>
Date: Tue, 3 Mar 2015 14:50:32 +0000 (-0500)
Subject: Merge branch 'OlafMerkert-master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=0ba84f080814325b87ce0f6782da9bdedd471442;hp=0ba84f080814325b87ce0f6782da9bdedd471442;p=org-ref.git

Merge branch 'OlafMerkert-master'
---