Merge branch 'master' into todd_prdr
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 20 Jan 2013 18:19:53 +0000 (18:19 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 20 Jan 2013 18:19:53 +0000 (18:19 +0000)
commit3147c57cb983b52db9c4582e091fea84f3991867
tree888f8e7189b9d52cbb57e32440caaf6a8bb76441
parent84a61ada1c1dbfd9712da9d04dbb17467274eef4
parent514ee161db1166e94b9ee889953f2e9774cee973
Merge branch 'master' into todd_prdr

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