Merge pull request #11023 from civicrm/4.7.25-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 24 Sep 2017 05:58:00 +0000 (18:58 +1300)
committerGitHub <noreply@github.com>
Sun, 24 Sep 2017 05:58:00 +0000 (18:58 +1300)
4.7.25 rc


Trivial merge