projects
/
contrib
/
Conifer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d8c190
e669887
)
Merge remote-tracking branch 'origin/rel_2_7_mergery' into HEAD
author
Dan Scott
<dscott@laurentian.ca>
Tue, 17 Nov 2015 17:13:46 +0000
(12:13 -0500)
committer
Dan Scott
<dscott@laurentian.ca>
Tue, 17 Nov 2015 17:13:46 +0000
(12:13 -0500)
Trivial merge