Merge branch 'new-pw'
commit42f239cb0e97b82f59beae874e67c4afad86409f
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 2 Jul 2010 04:06:27 +0000 (2 06:06 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 2 Jul 2010 04:06:27 +0000 (2 06:06 +0200)
tree29a40c301e4add82416792328e80673e70a5c22a
parentd924a4d48e60e2c0470f8c472d2176bc8051a738
parentfb2a1c36c160d4e8c04e105f35fb27c15ea1ce1b
Merge branch 'new-pw'

Conflicts:
doc/org.texi
doc/org.texi