~cmiller/desktopcouch/proxy-for-consistent-port

Viewing all changes in revision 210.

  • Committer: Chad Miller
  • Date: 2010-11-25 12:55:08 UTC
  • mfrom: (199.2.25 desktopcouch)
  • Revision ID: chad.miller@canonical.com-20101125125508-h38sri1doifikwbi
Merge trunk to resolve conflicts.  

Fix lint complaints.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: