Merge branch 'irbrc'
commitd9595b3cb6e352c9f3e6859536ef94ad373911ce
authorAleksandr O. Levchuk <alevchuk@gmail.com>
Sat, 29 Sep 2007 03:25:49 +0000 (28 20:25 -0700)
committerAleksandr O. Levchuk <alevchuk@gmail.com>
Sat, 29 Sep 2007 03:25:49 +0000 (28 20:25 -0700)
tree7a19a9dc5582df9543e48a48f30365115aebbf6f
parent2ddc2d84aca0777fac111e2372e6867aac1ab31b
parent7e6200d6e83fa4329d6588c68537b66d58fa1ef1
Merge branch 'irbrc'

Conflicts:

.irbrc
.irbrc