| commit | 59c0fdb97667b3f40bd60c9fc14f0e218b95c37a | |
| author | lucas_nz <lucas_nz@hotmail.com> | |
| Mon, 18 Nov 2013 04:35:31 +0000 (18 17:35 +1300) | ||
| committer | lucas_nz <lucas_nz@hotmail.com> | |
| Mon, 18 Nov 2013 04:35:31 +0000 (18 17:35 +1300) | ||
| tree | e55e4f467c78c40bac39b00cc007a353d8742177 | treesnapshot (tar.gz zip) |
| parent | a7c4d9efc3772410ee139b1ea4326b6e8ff14d76 | commitdiff |
| parent | 96b5bef35ff08dca7e2f6f78cf161824b9ccf947 | commitdiff |
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine.git
Conflicts:
plugins/togo/templates/npl.tmpl
Conflicts:
plugins/togo/templates/npl.tmpl