Merge branch 'master' into laptop
authorMart Lubbers <mart@martlubbers.net>
Sat, 20 Aug 2016 11:58:16 +0000 (13:58 +0200)
committerMart Lubbers <mart@martlubbers.net>
Sat, 20 Aug 2016 11:58:16 +0000 (13:58 +0200)
1  2 
shell/.bashrc

diff --cc shell/.bashrc
Simple merge