projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34e1090 e2d85c9)
Merge commit 'e2d85c92c3232' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:28 +0000 (16:25 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:28 +0000 (16:25 -0800)
Conflicts:
xml/version.xml


Trivial merge