]> git.parisson.com Git - telecaster-instance.git/commit
Merge branch 'dev' of git.parisson.com:git/telecaster-instance into nuc
authoryomguy <yomguy@parisson.com>
Thu, 7 Nov 2013 22:18:51 +0000 (23:18 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 7 Nov 2013 22:18:51 +0000 (23:18 +0100)
commit43d147afd8812eb061801cc01cf2fc82ab1efa5e
tree34071aac51bbc100bd008531d4ae5e2547e56b8b
parentb36f0abd2dd2fdd5a17eb09e3c5fa5a027995197
parent2e46993c6bb26d48a5fbdbce57eff2117528cc74
Merge branch 'dev' of git.parisson.com:git/telecaster-instance into nuc

Conflicts:
settings.py
settings.pyc
settings.py