Merge branch 'master' into todd_prdr
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 13 Jan 2013 23:03:48 +0000 (23:03 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 13 Jan 2013 23:15:41 +0000 (23:15 +0000)
commit929312a032f03bb17ed3554bd91e7fadf770efe9
tree45ec11d36c8d0c5dca9d34bdddf396afe99fab50
parent130fde0ab2b7bde9edbf347e9c57a9da314134f2
parent94eaf700d71d8bf9a45617c0323fa66fc148aab2
Merge branch 'master' into todd_prdr

Conflicts:
doc/doc-txt/ChangeLog
doc/doc-docbook/spec.xfpt
doc/doc-txt/ChangeLog
doc/doc-txt/NewStuff