From: Joey Hess <joey@kitenet.net>
Date: Fri, 5 Jul 2013 17:26:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'mr/master'
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/a8fbc68d97b36912fbc8f391b1afaf6aa69ebe4b?hp=a8fbc68d97b36912fbc8f391b1afaf6aa69ebe4b

Merge remote-tracking branch 'mr/master'
---