Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sat, 7 Nov 2009 02:02:23 +0000 (21:02 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 7 Nov 2009 02:02:23 +0000 (21:02 -0500)
1  2 
openbox/actions/session.c

Simple merge