]> git.etc.gen.nz Git - mythtv-status.git/commit
Merge branch 'release-0.10' into release-0.10-debian-squeeze
authorAndrew Ruthven <andrew@etc.gen.nz>
Wed, 3 Oct 2012 10:23:46 +0000 (23:23 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Wed, 3 Oct 2012 10:23:46 +0000 (23:23 +1300)
commit58d61ca35e5e91fc0bccef839059fcdc187abe8b
tree657a72eb53c1f6b4d31851aa03203f92c718ed16
parent135b122716b462e648a63cfd519c5e5876aa85d5
parent52eede6ea97e9d788362e20a47cdd0b0782f43b8
Merge branch 'release-0.10' into release-0.10-debian-squeeze

Conflicts:
debian/changelog
Makefile
debian/changelog