Merge branch '4.5' of https://github.com/civicrm/civicrm-core into 4.6
authorColeman Watts <coleman@civicrm.org>
Mon, 23 Mar 2015 20:29:31 +0000 (16:29 -0400)
committerColeman Watts <coleman@civicrm.org>
Mon, 23 Mar 2015 20:29:31 +0000 (16:29 -0400)
commit776ff7a00ca98cd3f668e43e4419c62791b1110f
tree8da2e2bc52b9ac7379e0bdfa01f1af1eb56387f6
parent695ad4c7ac02fbf3c87c80ecdf6346ad44759491
parent17d67fe2fa78a9095dea1cea31672de234982943
Merge branch '4.5' of https://github.com/civicrm/civicrm-core into 4.6

Conflicts:
js/Common.js
js/Common.js