From: Olof-Joachim Frahm <olof@macrolet.net>
Date: Thu, 6 Jun 2013 21:05:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'RobBlackwell/master'
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=a16b18e3d0e52886badfaedfb3aa5ba1d886cbdb;hp=-c;p=binary-types.git

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

a16b18e3d0e52886badfaedfb3aa5ba1d886cbdb