Merge branch 'master' of https://github.com/OlafMerkert/org-ref into OlafMerkert...
authorJohn Kitchin <jkitchin@andrew.cmu.edu>
Tue, 3 Mar 2015 14:47:25 +0000 (09:47 -0500)
committerJohn Kitchin <jkitchin@andrew.cmu.edu>
Tue, 3 Mar 2015 14:47:25 +0000 (09:47 -0500)

Trivial merge