Merge remote-tracking branch 'remotes/conifer/features/2.4-to-2.7' into mergery_2_7
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:21:35 +0000 (07:21 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:21:35 +0000 (07:21 -0500)
commita1e56a53bae4470ec483387e474916c0be30ce93
treeeb602ab7d8aa5626b1e7da6f1cf7f9688c7f4de8
parent8ac9362720d14c8f7c8998ab8e4e156aca8d4709
parent601994b6955c493419d7408b2bb6ae1d9055340d
Merge remote-tracking branch 'remotes/conifer/features/2.4-to-2.7' into mergery_2_7