]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Fri, 6 Apr 2012 08:14:33 +0000 (10:14 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 6 Apr 2012 08:14:33 +0000 (10:14 +0200)
commit42d439dbdf94db7e7481e7d9f5177959d3ab3478
treed467cc9ef822297191795c08ee1e5f8d4be1772e
parent6a6127e00bd947b5b65a264c41f06315d7ab6728
parente5778eff8085f346910915b1660655fa0938cb87
Merge branch 'master' into dev
telemeta/views/base.py