Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 23:36:32 +0000 (18:36 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 23:36:32 +0000 (18:36 -0500)
1  2 
openbox/actions/session.c
openbox/ping.c

Simple merge
diff --cc openbox/ping.c
Simple merge