Merge pull request #864 from eileenmcnaughton/CRM-12160
authordlobo <lobo@civicrm.org>
Sun, 26 May 2013 19:52:57 +0000 (12:52 -0700)
committerdlobo <lobo@civicrm.org>
Sun, 26 May 2013 19:52:57 +0000 (12:52 -0700)
Crm 12160 -fix navigation upgrade errors


Trivial merge