commit 46cab93562429cd19029402a2387f63a72aeb898
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Tue Jul 31 14:21:22 2012 -0400

    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
Merge: a4cdc9e 1c496c8
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Tue Jul 31 14:22:32 2012 -0400

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

commit 1c496c81662eabda444452071eb18f2fd375d4d0
Author: Kyle <klillis@gmail.com>
Date:   Mon Jul 30 13:34:11 2012 -0400

    Fixes #10897. Clear paused when we unpause FirewireRecorder.
    
    Signed-off-by: Daniel Thor Kristjansson <danielk@cuymedia.net>

commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
Author: Daniel Thor Kristjansson <dkristjansson@mythtv.org>
Date:   Tue Jul 24 12:13:16 2012 -0400

    Fixes #10870. Fix Start/Stop race condition in StreamHandler.
    
    This is a backport of [445faaa47].

commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Jul 29 12:42:41 2012 +0100

    Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
    (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)

commit 3256849b14cc882536a153e7fbe4724adf03260c
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Tue Jul 24 10:56:15 2012 -0700

    Subtitles: backport some code to enable cc608 TT deprecation log message.

commit 39fad46248bbcbe5ab27068e73fb7c5a91bc155b
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Tue Jul 24 08:23:53 2012 -0700

    Subtitles: Put a "DEPRECATED_608_TELETEXT" message into the logs.
    
    Support for CEA-608 teletext captions is to be removed.  Allow users
    to check whether they would be affected.  Refs #10786.
    (cherry picked from commit 7b1aef85ec92658acb91c1ff019aed909e5df30a)

commit 9e0d839be7667056dc65b79711dda84159a1b13d
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Tue Jul 24 14:11:47 2012 +0100

    Set m_cdWatcher to NULL after deletion, fixes segfault on exiting frontend. Fixes #10936
    (cherry picked from commit de851dd273eaa80689a427f915c7db40d015e0ba)

commit 10a68895e1fcd5c409058d2eb61fe59e78736235
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Jul 22 23:24:40 2012 +0100

    Fix segfault after music scan completes.
    (cherry picked from commit b2379ae9b8d42c23c3feee26b52a1f0a2ebef394)

commit ed58b3a818a1796340ba0f085a53159eb1d52266
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sat Jul 21 23:53:41 2012 +0100

    Fix for Synaesthesia memory corruption
    
    We were allocating just half the required space and consequently
    writing beyond the end of the array. This consistently caused
    segfaults for me when using the Synaesthesia visualiser.
    
    This fix appears to be consistent with the code used in other projects
    which were also derived from the original Synaesthia project.
    
    e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
    (cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)

commit a4cdc9e01295991056cdc8c5411e70937b1a4842
Merge: 450ed91 f0e2ad8
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Fri Jul 20 21:06:48 2012 -0400

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

commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
Author: Jean-Yves Avenard <jyavenard@mythtv.org>
Date:   Wed Jul 18 20:49:11 2012 +1000

    Make AllowLinkLocal default to true
    
    Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>

commit 4b82e27e6c89bac9d60c3a56f1d924979c80c746
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Wed Jul 18 01:50:46 2012 -0400

    Correct bad copy/paste in ServerPool.
    
    Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>

commit e4ba7d74aee6bd437e747772046a8836fa9ae5cb
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sat Jul 14 01:57:46 2012 -0400

    Rework IP selection so link-local is always used.
    
    This adds an option to mythtv-setup that makes link-local addresses
    listened to by default.  This behavior can still be disabled, to block
    off network access.
    
    Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>

commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
Author: GDragon <gdragon@jetcom.org>
Date:   Mon Jul 9 15:33:31 2012 -0400

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