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

[Christopher Bratusek <chrisb src gnome org>]

commit 762d1f2ea10cb7bea55427ad178cd8a59e79e3ef
Merge: a1db026... 7ef2fef...
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Oct 10 10:02:29 2009 +0200

    Merge branch 'teika'
    
    Conflicts:
    	ChangeLog

 ChangeLog                        |    4 ++++
 lisp/sawfish/wm/commands/user.jl |   16 ----------------
 man/news.texi                    |    2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)
---
diff --cc ChangeLog
index fcf92b3,ba8c1a9..1343bef
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2009-10-09  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/menus.jl: added "Reload Appsmenu" entry
 +
 +	* src/windows.c: more work on the race condition fix [Janek Kozicki]
 +
+ 2009-10-09  Teika kazura <teika lavabit com>
+ 	* lisp/sawfish/wm/commands/user.jl
+ 	* man/news.texi:  Deleted functions `some' and `program-available'. They should be in librep.  They are adopted in commit e1f68c.
+ 
  2009-10-08  Christopher Bratusek <zanghar freenet de>
  	* ChangeLog
  	* man/sawfish.texi