Merge pull request #11083 from civicrm/4.7.26-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 8 Oct 2017 00:50:47 +0000 (13:50 +1300)
committerGitHub <noreply@github.com>
Sun, 8 Oct 2017 00:50:47 +0000 (13:50 +1300)
4.7.26 rc


Trivial merge