Merge remote-tracking branch 'origin/master'
authorDon Armstrong <don@donarmstrong.com>
Mon, 1 Jun 2015 15:14:41 +0000 (08:14 -0700)
committerDon Armstrong <don@donarmstrong.com>
Mon, 1 Jun 2015 15:14:41 +0000 (08:14 -0700)
commit3f79a48e7c9188ce8d8a03da19ae1b2496c5d4cf
tree469bfb36ae7318be5099dd1fed07dd3aad51d219
parente15d6b6fd62ef1ce8f807ef6f7b0f957cf9092a5
parent9eaf0b20fe03cdf4159856288550c464e6d8657c
Merge remote-tracking branch 'origin/master'

Conflicts:
Makefile
org-ref.org
Makefile
org-ref.org