[mythtv-commits] mythtv/master commit: cd2bc0a47 by Daniel Thor Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Thor Kristjansson <dkristjansson at mythtv.org>
 Change Date:  2010-12-24T05:35:46-08:00
   Push Date:  2010/12/24 05:36:50 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  cd2bc0a47d38e133743216468d5d22d1b5947e18
   Changeset:  https://github.com/MythTV/mythtv/commit/cd2bc0a47

Log:

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

*sigh* I'll figure out git evenetually.

This reverts commit 255ce9ad2d9c8f7b9d6fd6b967750ee791634717.

Modified:

   mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py
   mythtv/bindings/python/scripts/mythwikiscripts