~jelmer/bzr-builddeb/merge-upstream-hook

Viewing all changes in revision 510.

  • Committer: Jelmer Vernooij
  • Date: 2011-02-03 19:38:30 UTC
  • mfrom: (507.2.1 trunk)
  • Revision ID: jelmer@samba.org-20110203193830-lcfhvimrd2c5vbtm
Merge fix for invalid conf test.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: