Merge branch 'ath-current' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Jun 2014 15:39:36 +0000 (11:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Jun 2014 15:39:36 +0000 (11:39 -0400)

Trivial merge