Merge commit '0433db08af3db8454dd90cb416060dae2fe64716' into ps1-title
commitc40377c36c258ce3eda657a51805eff9c4b70b74
authorTay Ray Chuan <rctay89@gmail.com>
Tue, 9 Apr 2013 06:31:00 +0000 (9 14:31 +0800)
committerTay Ray Chuan <rctay89@gmail.com>
Tue, 9 Apr 2013 06:42:49 +0000 (9 14:42 +0800)
tree5a26eb7d69f9b2f981f57064be4a2478b06209ad
parentdac8d212043d1cc21c5a20a052ecd9c315afb524
parent0433db08af3db8454dd90cb416060dae2fe64716
Merge commit '0433db08af3db8454dd90cb416060dae2fe64716' into ps1-title

In effect, this reverts 0433db08af3db8454dd90cb416060dae2fe64716, since
its motivation (beep, double-display of pwd) is no longer present.

Conflicts:
etc/profile
etc/profile