commit 0840c5c7d1256652afe258085f416edb4a4289d1
Merge: cbd5b45 0a96f1c
Author: Clint Savage <herlo1 at gmail.com>
Date: Sat Jul 23 15:21:07 2011 -0600
resolved merge conflicts
django-tracking.spec | 23 ++++++++++++++---------
sources | 2 +-
views.py.patch | 8 ++++++++
3 files changed, 23 insertions(+), 10 deletions(-)
---