Merge branch 'master' of git://repo.or.cz/luxor
commit858663129c7256c862d8046f61e57f114f134e42
authorOpsidao <opsi@mac-mini.(none)>
Sun, 18 May 2008 20:37:16 +0000 (18 22:37 +0200)
committerOpsidao <opsi@mac-mini.(none)>
Sun, 18 May 2008 20:37:16 +0000 (18 22:37 +0200)
treeb29d97f77136bb662d249f0966b90c8ebb150e0a
parent4a37c007118bc2df0cdd3a7f3207c17a7747b1cf
parentce5ea4b530f974fa3eaa7a354a17a84d0589216e
Merge branch 'master' of git://repo.or.cz/luxor