projects
/
contrib
/
Conifer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
327da12
283cd5f
)
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
author
Dan Scott
<dscott@laurentian.ca>
Sun, 11 Jan 2015 02:37:09 +0000
(21:37 -0500)
committer
Dan Scott
<dscott@laurentian.ca>
Sun, 11 Jan 2015 02:37:09 +0000
(21:37 -0500)
Trivial merge