[mythtv-commits] mythtv/master commit: 6014eb6dd by Stuart Auchterlonie (stuarta)

[MythTV]

      Author:  Stuart Auchterlonie <stuarta at squashedfrog.net>
 Change Date:  2011-05-05T14:48:26-07:00
   Push Date:  2011/05/05 14:48:33 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  6014eb6dd00a9f7114c5b117ac4a92533d9d06b9
   Changeset:  https://github.com/MythTV/mythtv/commit/6014eb6dd

Log:

Merge branch 'master' of github.com:MythTV/mythtv

Modified:

   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mainserver.h