projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 366421b 14a623a)
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Thu, 12 Mar 2015 20:23:23 +0000 (16:23 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 12 Mar 2015 20:23:23 +0000 (16:23 -0400)

Trivial merge
Evergreen contribs