From: graysky <graysky@archlinux.us>
Date: Wed, 17 Dec 2014 14:01:36 +0000 (-0500)
Subject: Merge pull request #1 from groeck/master
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F34%2Fhead;p=groeck-nct6775

Merge pull request #1 from groeck/master

sync with upstream
---

8294069347606d863ff9d51f6a0e5f3004fbd93c