~mhall119/loco-team-portal/fixes-599640

Viewing all changes in revision 200.

  • Committer: Daniel Holbach
  • Date: 2010-07-27 10:47:28 UTC
  • mfrom: (198.1.1 bugfix-lp-607615)
  • Revision ID: daniel.holbach@canonical.com-20100727104728-z6p25wjp0bwz3r9i
merged lp:~chrisjohnston/loco-directory/bugfix-lp-607615 and resolved conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: