Merge branch 'MAINT_3_4_5' into QA_3_4
commitc5a641961861f3e82b282582c1b86222d73409bf
authorMarc Delisle <marc@infomarc.info>
Thu, 8 Sep 2011 19:41:40 +0000 (8 15:41 -0400)
committerMarc Delisle <marc@infomarc.info>
Thu, 8 Sep 2011 19:41:40 +0000 (8 15:41 -0400)
tree925f6753adbc8392f5870a5bcc686ba2dff9a57b
parentc02bd600eeee9a9f17a51c602bc32917de5e28eb
parentbda213c58aec44925be661acb0e76c19483ea170
Merge branch 'MAINT_3_4_5' into QA_3_4
ChangeLog