Merge pull request #9113 from civicrm/4.7.12-rc
authorTim Otten <totten@civicrm.org>
Mon, 26 Sep 2016 15:02:23 +0000 (11:02 -0400)
committerGitHub <noreply@github.com>
Mon, 26 Sep 2016 15:02:23 +0000 (11:02 -0400)
4.7.12 rc


Trivial merge