From: Don Armstrong <don@debian.org>
Date: Fri, 13 Jun 2014 19:55:04 +0000 (-0700)
Subject: Merge tag 'upstream/1.1+hg7904'
X-Git-Tag: debian/1.1+hg7904-0+nmu1~1
X-Git-Url: https://git.donarmstrong.com/?p=dactyl.git;a=commitdiff_plain;h=0bcd111e64a8cb0f8019a4cb3270fc5b46270a1b

Merge tag 'upstream/1.1+hg7904'

Upstream version 1.1+hg7904
---

0bcd111e64a8cb0f8019a4cb3270fc5b46270a1b