[sawfish: 10/10] Merge branch 'teika'

[Christopher Bratusek <chrisb src gnome org>]

commit efe929542980304a6340718c00ed67df22d33c2d
Merge: c1c91b8... 381d634...
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Tue Oct 6 17:57:56 2009 +0200

    Merge branch 'teika'
    
    Conflicts:
    	ChangeLog

 ChangeLog                           |   18 +++++++++++++++++
 OPTIONS                             |   25 ++++++++++++++++++++---
 lisp/sawfish/wm/autoload.jl         |    2 +-
 lisp/sawfish/wm/ext/match-window.jl |   21 +++----------------
 lisp/sawfish/wm/frames.jl           |   11 ++++++---
 lisp/sawfish/wm/windows.jl          |   32 +++++++++++++++++++++++-------
 man/faq.texi                        |   10 +++++---
 man/sawfish.texi                    |   36 ++++++++++++++++++++++++----------
 8 files changed, 106 insertions(+), 49 deletions(-)
---
diff --cc ChangeLog
index 804b646,8ec9945..21f8026
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,15 @@@
 +2009-10-05  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/defaults.jl
 +	* man/news.texi: removed try-require
 +
 +2009-10-03  Jeremy Hankins <nowan nowan org>
 +	* lisp/sawfish/cfg/main.jl.in
 +	* lisp/sawfish/gtk/widgets/font.jl.in
 +	* scripts/sawfish-about.jl.in: Whitespace cleanup in files that were missed before.
 +
+ 2009-10-03  Teika kazura <teika lavabit com>
+ 	* man/faq.texi: update on how to read info
+ 
  2009-10-01  Christopher Bratusek <zanghar freenet de>
  	* configure.in
  	* OPTIONS