tree b5aa09c1f106be667699c9073caf22f7c52ad736
parent 21d5b3c7916002595da83bbe34fead2bdf9d8b6c
parent a359dbeb7dda2cc1566de92829943451e273c59c
author Andy Bavier <acb@cs.princeton.edu> 1457302767 -0500
committer Andy Bavier <acb@cs.princeton.edu> 1457302767 -0500

Merge branch 'acb-develop'
Activate enabling / disabling service