[Monotone-commits-diffs] Revision ae4371bb88e17200cb41c4f0cc69c3f777923836

[monotone]

-----------------------------------------------------------------
Revision: ae4371bb88e17200cb41c4f0cc69c3f777923836
Ancestor: 4d986b8399807b7ff628f453bae048ff30e8e3ce
Ancestor: b5fe1b04ace147e6ae84ff6fb9ec4d23d54cfe3a
Author: Richard Levitte <address@hidden>
Date: 2008-12-22T13:57:07
Branch: net.venge.monotone

Added files:
        tests/attr_mtn_execute/__driver__.lua
        tests/automate_lua/__driver__.lua
        tests/automate_lua/test.lua
Added directories:
        tests/attr_mtn_execute tests/automate_lua
Modified files:
        NEWS UPGRADE automate.cc botan/README.botan-monotone
        cmd_automate.cc cmd_conflicts.cc cmd_merging.cc
        cmd_packet.cc contrib/ciabot_monotone.py lua_hooks.cc
        lua_hooks.hh monotone.texi notes/release-checklist.txt
        po/LINGUAS po/POTFILES.in po/de.po po/es.po po/fr.po
        po/it.po po/sv.po std_hooks.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        win32/README win32/monotone.iss

ChangeLog: 

merge of '4d986b8399807b7ff628f453bae048ff30e8e3ce'
     and 'b5fe1b04ace147e6ae84ff6fb9ec4d23d54cfe3a'


monotone --db={your.database} diff 
--revision=4d986b8399807b7ff628f453bae048ff30e8e3ce 
--revision=ae4371bb88e17200cb41c4f0cc69c3f777923836
monotone --db={your.database} diff 
--revision=b5fe1b04ace147e6ae84ff6fb9ec4d23d54cfe3a 
--revision=ae4371bb88e17200cb41c4f0cc69c3f777923836
----------------------------------------------------------------------