Merge branch 'master' into todd_prdr
authorJeremy Harris <jgh146exb@wizmail.org>
Mon, 14 Jan 2013 22:14:53 +0000 (22:14 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Mon, 14 Jan 2013 22:14:53 +0000 (22:14 +0000)
commit22ba98de76fe7a6c50748218a260d4caceac3b91
tree46194568c110d557ae04c184bb6c8bbe95263941
parentdf8632277e3058a3eb2bec5bdf6a67311ffad6d6
parent6f5a440ab65a2ec977db14ec69698068aed98935
Merge branch 'master' into todd_prdr

Conflicts:
doc/doc-txt/ChangeLog
doc/doc-txt/ChangeLog