Merge commit '3fa56d7925d5b24c5cd11c61bd6b3235e753a055'

author rocky <rocky@gnu.org>

Tue, 17 Feb 2015 13:57:06 +0000 (08:57 -0500)

committer rocky <rocky@gnu.org>

Tue, 17 Feb 2015 13:57:06 +0000 (08:57 -0500)
author rocky <rocky@gnu.org>
Tue, 17 Feb 2015 13:57:06 +0000 (08:57 -0500)
committer rocky <rocky@gnu.org>
Tue, 17 Feb 2015 13:57:06 +0000 (08:57 -0500)
diff --cc packages/load-relative/load-relative.el
Simple merge
author	rocky <rocky@gnu.org>
	Tue, 17 Feb 2015 13:57:06 +0000 (08:57 -0500)
committer	rocky <rocky@gnu.org>
	Tue, 17 Feb 2015 13:57:06 +0000 (08:57 -0500)