commit b20560d03191f0d9db63bc092f41b166ed2790bf Merge: c63b742 dc04a95 Author: Kamran Riaz Khan krkhan@inspirated.com Date: Wed Jul 20 15:51:09 2011 +0500

Merge branch 'master' of git://git.torproject.org/arm

src/cli/controller.py | 5 +++-- src/cli/logPanel.py | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-)