[Monotone-commits-diffs] Revision f3192b68dba71bfd84c943de3d519ca03f6313d1

[monotone]

-----------------------------------------------------------------
Revision: f3192b68dba71bfd84c943de3d519ca03f6313d1
Ancestor: 2f023f626a4293258c548aba4bcde8257a12ee13
Ancestor: 3f26175d1c4a3046c69dc40e030b6c3a53b77406
Author: address@hidden
Date: 2010-06-13 22.55.13
Branch: net.venge.monotone.web

Renamed entries:
        rss_feeds.inc.php to config.inc.php-dist
Added files:
        .htaccess config.inc.php
        wiki/OverwritableNegatableOptions.mdwn
        wiki/UpdateConflicts.mdwn
Modified files:
        config.inc.php-dist downloads.php index.php intheblogs.php
        wiki/AutomateVersions.mdwn wiki/RoadMap.mdwn
        wiki/ZipperMerge.mdwn

ChangeLog: 

merge of '2f023f626a4293258c548aba4bcde8257a12ee13'
     and '3f26175d1c4a3046c69dc40e030b6c3a53b77406'


monotone --db={your.database} diff 
--revision=2f023f626a4293258c548aba4bcde8257a12ee13 
--revision=f3192b68dba71bfd84c943de3d519ca03f6313d1
monotone --db={your.database} diff 
--revision=3f26175d1c4a3046c69dc40e030b6c3a53b77406 
--revision=f3192b68dba71bfd84c943de3d519ca03f6313d1
----------------------------------------------------------------------