4533: Merge branch 'master' into 4533-remote-reset
authorTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 17:38:01 +0000 (12:38 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 17:38:01 +0000 (12:38 -0500)
commit76eaaac9fed4e74b8073ee08f99b84fc7922ac9f
tree0212d65e69c90bd6e3143fc4f596af7454b94af1
parente65d698ab39cb44cf12630498ac75b475bedec44
parent84efd065eba386e98e07cdd232dc172e169af451
4533: Merge branch 'master' into 4533-remote-reset