| commit | 79237a7da30c6ce2efd58f76eb52bc20531c62f7 | |
| author | lucas_nz <lucas_nz@hotmail.com> | |
| Fri, 19 Jul 2013 09:14:37 +0000 (19 21:14 +1200) | ||
| committer | lucas_nz <lucas_nz@hotmail.com> | |
| Fri, 19 Jul 2013 09:14:37 +0000 (19 21:14 +1200) | ||
| tree | d1479c48ef5b4eb5f25e274b181cbaaffdbd3c20 | treesnapshot (tar.gz zip) |
| parent | e2bc69c372136fe306b6ffdc726897a7fc980a3f | commitdiff |
| parent | d3647d02027beca2d143a47960de8ef7821efce8 | commitdiff |
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine.git
Conflicts:
plugins/settings/templates/settings.tmpl
plugins/togo/templates/npl.tmpl
plugins/video/templates/container_html.tmpl
Conflicts:
plugins/settings/templates/settings.tmpl
plugins/togo/templates/npl.tmpl
plugins/video/templates/container_html.tmpl