Commit 4a4f3ffb authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of cgit.shore.co.il:/srv/git/rcfiles 

# Conflicts:
#	.bashrc
parents db1f7c6a 9998f2c9

There are no changes