am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
* commit 'd2285942dde8f2633f1d79abc01e598da7925090': Ignoring specific db exception DO NOT MERGE
This commit is contained in: