Merge remote-tracking branch 'xu-cheng/zsh-completion'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 12 Oct 2014 21:30:17 +0000 (23:30 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 12 Oct 2014 21:30:17 +0000 (23:30 +0200)

Trivial merge