Merge git://repo.or.cz/gsh
commit2f0599bff23c47565af00aa39d639cec60344546
authorGuillaume Chazarain <guichaz@gmail.com>
Fri, 9 May 2008 21:48:20 +0000 (9 23:48 +0200)
committerGuillaume Chazarain <guichaz@gmail.com>
Fri, 9 May 2008 21:48:20 +0000 (9 23:48 +0200)
tree609204d95354be56f9482863d989be67e93a5c2c
parentfbc955d11d64b978c79eb1af8779a48607919093
parent630a893f764daec74845e1f3c292629e65fdb2ba
Merge git://repo.or.cz/gsh

Conflicts:

gsh/pity.py
gsh/stdin.py
gsh/pity.py
gsh/stdin.py