]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 21:09:18 +0000 (22:09 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 21:09:18 +0000 (22:09 +0100)
commit1297c72a95175ee1cfa26a0b60993e994699481e
tree4d298ab3086e58ba5180a20e1599fab00d5edda8
parentf70f19af21988bc292a4edb65b7474c23b4ffb5b
parent970a396040daa608589018b4be9a9fdc8524e77c
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6