Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12
authorChris Burgess <chris@giantrobot.co.nz>
Tue, 20 Jan 2015 00:49:01 +0000 (13:49 +1300)
committerChris Burgess <chris@giantrobot.co.nz>
Tue, 20 Jan 2015 00:49:01 +0000 (13:49 +1300)
commit1b9976cbf762dbf6513df8a4141626d2e5584171
tree1f0eebabc288ed72c03ec2f86046e630a45395a9
parent8d7a9d07300f31c5ae3b25188e27a1d8711654cd
parent719d361de2687a1ea55a0a35e620bd8c8d84e16c
Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12

Conflicts:
CRM/Core/Page.php