]> 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 00:44:51 +0000 (01:44 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 00:44:51 +0000 (01:44 +0100)
commitaa1333dc3d143792ccfa6b93c0dff05296bae10d
tree506fe0507c319fa7a46a1109b846a6d1173b174f
parentb2a111524678285356cf82c0b49690f7e903d829
parentd689ac50d49cf361aa927d9f365aa4b9adb2baa5
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6