Merge "Don't exit too quickly when reporting an exception."
authorAaron Schulz <aschulz@wikimedia.org>
Tue, 11 Sep 2012 00:31:46 +0000 (00:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Sep 2012 00:31:46 +0000 (00:31 +0000)

Trivial merge