Issue #2252 - remove file accidentally re-added by the merge.

Former-commit-id: 09546736f2 [formerly 0ba5c54688] [formerly 3bdbf6d0cc] [formerly 5c6258e8c1 [formerly 3bdbf6d0cc [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]
Former-commit-id: 5c6258e8c1
Former-commit-id: e0a4220ad22d5843e5444411defaa80103a9ae61 [formerly a35cbbf85c]
Former-commit-id: 4f0b9b4cf3
This commit is contained in:
Bryan Kowal 2013-08-08 18:38:21 -05:00
parent b46745eebb
commit 0d1cf60269