[mh-svn] SF.net SVN: misterhouse:[1965] branches/insteon

[Misterhouse S. C. N. <mis...@li...>]

Revision: 1965
          http://misterhouse.svn.sourceforge.net/misterhouse/?rev=1965&view=rev
Author:   peloy
Date:     2011-12-20 23:54:54 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Synchronize the "insteon" branch with the latest changes in trunk,
where "latest changes" is defined as all changes since the previous
trunk-to-branch merge, which happened at r1948.

Command used for the merge:

svn merge -x --ignore-eol-style -r 1948:HEAD https://misterhouse.svn.sourceforge.net/svnroot/misterhouse/trunk

Please report any problems with this merge to me (pe...@ch...).

Revision Links:
--------------
    http://misterhouse.svn.sourceforge.net/misterhouse/?rev=1948&view=rev

Modified Paths:
--------------
    branches/insteon/code/common/internet_weather.pl
    branches/insteon/code/public/iphone.pl
    branches/insteon/lib/Network_Item.pm
    branches/insteon/lib/UPB_Thermostat.pm
    branches/insteon/lib/read_table_A.pl
    branches/insteon/lib/trigger_code.pl

Property Changed:
----------------
    branches/insteon/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.