Merge remote-tracking branch 'origin/rel_2_7_mergery' into HEAD
authorDan Scott <dscott@laurentian.ca>
Tue, 17 Nov 2015 17:13:46 +0000 (12:13 -0500)
committerDan Scott <dscott@laurentian.ca>
Tue, 17 Nov 2015 17:13:46 +0000 (12:13 -0500)
commit1120a1f018628901bfffdb18d1fbd829c9a4cd52
treed2357a9ce39f97ffa1f20333dd39fb91bdd46657
parent9d8c190eaf37228d58b20e21c30f04ba88167fce
parente66988794349676af3adbd89f93c4f4a0295a9d9
Merge remote-tracking branch 'origin/rel_2_7_mergery' into HEAD