]> git.etc.gen.nz Git - mythtv-status.git/commit
Merge branch 'release-0.5'
authorAndrew Ruthven <andrew@etc.gen.nz>
Fri, 7 Dec 2007 04:13:55 +0000 (17:13 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Fri, 7 Dec 2007 04:13:55 +0000 (17:13 +1300)
commit35879f12f460546b43d5f133b1f5a7e6e56804df
tree02308c1b617cafbe8ce103d3a2bd8db71e8eb20c
parentcab6bef59fd164fc839269c831edbe168efa77d7
parentb2abe52208d30ab1a041731dcc09467c3cb2ed7d
Merge branch 'release-0.5'

Conflicts:

ChangeLog
bin/mythtv-status
ChangeLog
bin/mythtv-status