]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Fri, 6 Apr 2012 08:19:56 +0000 (10:19 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 6 Apr 2012 08:19:56 +0000 (10:19 +0200)
commitc40285d7657ce9a29f4e677d51abd73a523fb1d2
tree9a9f622919b766eaf5342553d414190258997b62
parent42d439dbdf94db7e7481e7d9f5177959d3ab3478
parent57833ebdb29c4ce9300a456692f17385af2139e4
Merge branch 'master' into dev
telemeta/views/base.py