From: root <root@ip-172-31-18-206.ap-southeast-2.compute.internal>
Date: Tue, 22 Apr 2014 07:51:00 +0000
Subject: Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-dga-stats
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-dga-stats.git&a=commitdiff&h=190db120ec3138a683f2782fdd6e535632bd8c92
---
Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-dga-stats

Conflicts:
ckanext/dga_stats/stats.py
---