← Back to branch summary

~piersharding/udi/master-udi

Viewing all changes in revision 255.

  • Committer: Piers Harding
  • Date: 2011-10-02 21:27:04 UTC
  • mfrom: (151.1.63)
  • Revision ID: git-v1:a3e8fccd857706bbe9f37a05061ddc2e2d0b8143
Merge branch 'master' into test-master-merge

Conflicts:
        lib/ds_ldap_pla.php
        lib/page.php

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: