From: dwickwire <wickwire@gmail.com>
Date: Wed, 18 Jan 2012 17:57:46 +0000 (-0600)
Subject: Adding basic merge template
X-Git-Tag: 22.4~61
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/5c23ea6294967989b40bb872ea7547a8544cb5c0?hp=5c23ea6294967989b40bb872ea7547a8544cb5c0

Adding basic merge template
---