| commit | 55201e72f3231e03eefcf6be4823e58eee47e1b9 | |
| author | lucas_nz <lucas_nz@hotmail.com> | |
| Thu, 15 Aug 2013 08:33:37 +0000 (15 20:33 +1200) | ||
| committer | lucas_nz <lucas_nz@hotmail.com> | |
| Thu, 15 Aug 2013 08:33:37 +0000 (15 20:33 +1200) | ||
| tree | 22a8518f27a72dcd3744e7c38538fd5f5e44ee13 | treesnapshot (tar.gz zip) |
| parent | 99e266ab9c18170387a949e35492d30a8f9018ba | commitdiff |
| parent | fbf4cd29032f294127ab3eda4a95a0acbf9bb7f8 | commitdiff |
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine.git
Conflicts:
config.py
Conflicts:
config.py