tree be4e4fe9a71fc01e611433d623bae672c99a39fd
parent 3ba6b5dc6111b4edfc9c9440f48db252444317d2
parent cb6bcd757882998b91e1da44c2485c6b6018ca46
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