]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Mon, 2 Apr 2012 10:36:43 +0000 (12:36 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 2 Apr 2012 10:36:43 +0000 (12:36 +0200)
commit18b4f7bab4f37119a815cf75763db17f20492f39
tree95115f64130844769c8537fbbf769ebcc04103f8
parent05d6f9e375fbf8d47e4877de051e34467b03ca70
parentef72a4d2a0b56aadbc1e3ba0e616272ca6130e1e
Merge branch 'master' into dev
telemeta/views/base.py