From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 1 Jun 2015 15:14:41 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=commitdiff_plain;h=3f79a48e7c9188ce8d8a03da19ae1b2496c5d4cf;hp=3f79a48e7c9188ce8d8a03da19ae1b2496c5d4cf

Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
	org-ref.org
---