projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db64d3e c4e58e3)
Merge branch 'live' of vcs.fsf.org:civicrm-core into live
authork054 <kosa@riseup.net>
Thu, 4 Feb 2016 22:29:13 +0000 (17:29 -0500)
committerk054 <kosa@riseup.net>
Thu, 4 Feb 2016 22:29:13 +0000 (17:29 -0500)

Trivial merge