~vcs-imports/network-manager/trunk

Viewing all changes in revision 4322.

  • Committer: Dan Williams
  • Date: 2011-02-13 04:51:12 UTC
  • mfrom: (4249.10.271)
  • Revision ID: git-v1:6d344a43e98ad26fe6f7fec40fde06076192c718
Merge remote-tracking branch 'origin/rm-userset'

There; it's merged.  Yay!

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: