~andrewsomething/bzr/lp1272042

Viewing all changes in revision 6524.1.1.

  • Committer: Jelmer Vernooij
  • Date: 2012-06-18 11:43:07 UTC
  • mfrom: (6437.54.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6525.
  • Revision ID: jelmer@samba.org-20120618114307-zeazlym311p38m98
MergeĀ 2.5.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: