Merge pull request #4684 from eileenmcnaughton/CRM-15683-masger
authorTim Otten <totten@civicrm.org>
Thu, 1 Jan 2015 22:22:22 +0000 (14:22 -0800)
committerTim Otten <totten@civicrm.org>
Thu, 1 Jan 2015 22:22:22 +0000 (14:22 -0800)
CRM-15678 hookable invalid page handling


Trivial merge