~timrchavez/offspring/offspring-build-ubuntu-images

Viewing all changes in revision 162.

  • Committer: Mike Heald
  • Date: 2013-05-17 14:42:13 UTC
  • mfrom: (161.1.1 offspring-django-1.4)
  • Revision ID: mike.heald@canonical.com-20130517144213-o121b9bj0scnxp8t
Merge of lp:~mike-powerthroughwords/offspring/offspring-django-1.4-mods [r=timrc]

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: