]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Tue, 3 Apr 2012 10:47:16 +0000 (12:47 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 3 Apr 2012 10:47:16 +0000 (12:47 +0200)
1  2 
telemeta/templates/telemeta/base.html

Simple merge