Merge "Remove strictIPs(), cascadingDeletes(), and cleanupTriggers()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 19 Sep 2016 20:21:16 +0000 (20:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 19 Sep 2016 20:21:16 +0000 (20:21 +0000)

Trivial merge