Merge branch 'master' into batch-20
authorTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 00:13:53 +0000 (16:13 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 00:13:53 +0000 (16:13 -0800)
commit3a89d0a60caf66bf3d1c142dd1dce44e85a8e252
tree92bfc39ecec25f8bf118bbc8311dc5f4aa826efe
parent36e590d44c1358aa06c4651a94c37726da80595d
parent5d0ae82e32449bfc236f571192f9d076d2a9a436
Merge branch 'master' into batch-20