← Back to branch summary

~mnordhoff/loggerhead/cheezum

« back to all changes in this revision

Viewing changes to loggerhead/apps/branch.py

  • Committer: Matt Nordhoff
  • Date: 2010-04-24 02:22:22 UTC
  • mfrom: (164.107.64 trunk-rich)
  • Revision ID: mnordhoff@mattnordhoff.com-20100424022222-amo98wo6s9rf80px
Merge trunk, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/branch.py
1
 
# Copyright (C) 2008, 2009 Canonical Ltd.
 
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by