projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9cfd60 8133915)
Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Thu, 12 Mar 2015 14:18:47 +0000 (10:18 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 12 Mar 2015 14:18:47 +0000 (10:18 -0400)

Trivial merge