Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-31-12-20-39
[civicrm-core.git] / CRM / Member / xml /
2013-03-01 Tim OttenImport from SVN (r45945, r596)