Dan Willemsen 15348ea4aa Merge "Replace custom rules, remove ACP" ...

am: a279b12

* commit 'a279b12905f31231a8f3c36c52abcd1224449c1a':
  Replace custom rules, remove ACP

2016-03-23 22:02:06 +00:00

..

monkey

Merge "Replace custom rules, remove ACP"

2016-03-23 22:02:06 +00:00