From: Bdale Garbee <bdale@gag.com>
Date: Fri, 29 Jun 2012 17:02:57 +0000 (-0600)
Subject: Merge tag 'upstream/3.14'
X-Git-Tag: debian/3.14-1~5
X-Git-Url: https://git.gag.com/?p=debian%2Felilo;a=commitdiff_plain;h=35066b3244e795da02400086f85660e9b0b9e490

Merge tag 'upstream/3.14'

Upstream version 3.14
---

35066b3244e795da02400086f85660e9b0b9e490