Oops, these should have been renamed too.
commit8705543450e0f0af40db3717104ce710df0333f4
authorDavid Aguilar <davvid@gmail.com>
Thu, 5 Jun 2008 07:26:19 +0000 (5 00:26 -0700)
committerDavid Aguilar <davvid@gmail.com>
Thu, 5 Jun 2008 07:26:19 +0000 (5 00:26 -0700)
treefddca92149ed4b84983904691d2bad2bd062dcfe
parent11a431f64f54f9bca14ce9264b683b27765a9eb1
Oops, these should have been renamed too.

Signed-off-by: David Aguilar <davvid@gmail.com>
ugit/controllers/__init__.py
ugit/controllers/merge.py