Merge branch 'master' of /git/dotfiles/scripts
authorJulien Valroff <julien@kirya.net>
Mon, 15 Feb 2016 12:36:19 +0000 (13:36 +0100)
committerJulien Valroff <julien@kirya.net>
Mon, 15 Feb 2016 12:36:19 +0000 (13:36 +0100)

Trivial merge