Merge remote-tracking branch 'remotes/conifer/feature/tpac_show_details_config_2_7...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:01 +0000 (07:23 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:01 +0000 (07:23 -0500)
commit54038d23d692f454684405e1c655f595348b5344
tree4014835a68216711c4e7f8c721fe5c5f61331f81
parenta1e56a53bae4470ec483387e474916c0be30ce93
parenta1e7e0176f86d7b06af1e23b376c4dae8955a0ab
Merge remote-tracking branch 'remotes/conifer/feature/tpac_show_details_config_2_7' into mergery_2_7