Merge branch 4.5 into master
authorColeman Watts <coleman@civicrm.org>
Mon, 16 Feb 2015 18:49:29 +0000 (13:49 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 16 Feb 2015 18:49:29 +0000 (13:49 -0500)
commit6d699851d58b6116417dd95d5821e1cdbdfe7e42
treebb41abc2e5d7c7e370bfb773a06e3802da2c721f
parentf78cb947d3187657b27ce042949804c6798b6afc
parent7e7c2acc504e2c59a8e2e0392769ed88dae86512
Merge branch 4.5 into master