[mythtv-firehose] mythtv branch fixes/0.25 updated by wagnerrp. v0.25.2-15-g46cab93

[Git Repo Owner]

The branch, fixes/0.25 has been updated on the
mythtv repository by gitolite user wagnerrp.
       via  46cab93562429cd19029402a2387f63a72aeb898 (commit)
       via  8ab229a8bed860fb0855797c683655a7465e2ee4 (commit)
       via  a4cdc9e01295991056cdc8c5411e70937b1a4842 (commit)
       via  450ed915d3a13b84489ecdebdad6fca18fc8c312 (commit)
      from  1c496c81662eabda444452071eb18f2fd375d4d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 46cab93562429cd19029402a2387f63a72aeb898
Author:    Raymond Wagner <rwagner at mythtv.org> at Tue, 31 Jul 2012 14:21:22 -0400
Committer: Raymond Wagner <rwagner at mythtv.org> at Tue, 31 Jul 2012 14:22:44 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=46cab93562429cd19029402a2387f63a72aeb898

Correct --printexpire option in mythbackend.
This corrects logic that was accidentally inverted in 8bc8dd54, and
allows `mythbackend --printexpire` to be used again.
(cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)



commit 8ab229a8bed860fb0855797c683655a7465e2ee4
Author:    Raymond Wagner <rwagner at mythtv.org> at Tue, 31 Jul 2012 14:22:32 -0400
Committer: Raymond Wagner <rwagner at mythtv.org> at Tue, 31 Jul 2012 14:22:32 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8ab229a8bed860fb0855797c683655a7465e2ee4

Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25



commit a4cdc9e01295991056cdc8c5411e70937b1a4842
Author:    Raymond Wagner <rwagner at mythtv.org> at Fri, 20 Jul 2012 21:06:48 -0400
Committer: Raymond Wagner <rwagner at mythtv.org> at Fri, 20 Jul 2012 21:06:48 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a4cdc9e01295991056cdc8c5411e70937b1a4842

Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25



commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
Author:    GDragon <gdragon at jetcom.org> at Mon, 9 Jul 2012 15:33:31 -0400
Committer: Raymond Wagner <rwagner at mythtv.org> at Mon, 9 Jul 2012 15:35:07 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=450ed915d3a13b84489ecdebdad6fca18fc8c312

Properly set job type in fromProgram and fromRecorded methods.
Signed-off-by: Raymond Wagner <rwagner at mythtv.org>
(cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)



-----------------------------------------------------------------------

Summary of changes:
 mythtv/bindings/python/MythTV/dataheap.py    |    2 ++
 mythtv/programs/mythbackend/main_helpers.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

--