~shanepatrickfagan/ubuntu-sso-client/nm-state-bug-fix

Viewing all changes in revision 675.27.21.

  • Committer: Manuel de la Pena
  • Date: 2011-04-15 08:39:36 UTC
  • mfrom: (707 ubuntu-sso-client)
  • mto: This revision was merged to the branch mainline in revision 708.
  • Revision ID: mandel@themacaque.com-20110415083936-d7g3pju4kczjr2x3
Fixed merge conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: