[guardian-dev] [guardianproject/Gibberbot] 5360c0: Merge branch 'savedstate' of https://github.com/de...

[Nathan Freitas]

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/Gibberbot

  Commit: 5360c0cc9555d6eac48905f1f3272cf124b88e01
      https://github.com/guardianproject/Gibberbot/commit/5360c0cc9555d6eac48905f1f3272cf124b88e01
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/app/ActiveChatListView.java

  Log Message:
  -----------
  Merge branch 'savedstate' of https://github.com/devrandom/Gibberbot into devrandom-savedstate

Conflicts:
	src/info/guardianproject/otr/app/im/app/ActiveChatListView.java