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)
commitae833e18bdf78a15ff3db3c1c616ee5a0850273d
tree9e35d04313f938e5084ba46a96ced228b3ccf038
parentd024f87b879f30112212e28979481d049b8d94b7
parent27970ff5278649a0a966f985919f3568d25d9d26
Merge branch 'master' into laptop
shell/.bashrc