Merge branch 'master' of git@gitorious.org:opensuse/webdesign
authorrlihm <rlihm@opensuse.org>
Mon, 1 Mar 2010 08:01:45 +0000 (09:01 +0100)
committerrlihm <rlihm@opensuse.org>
Mon, 1 Mar 2010 08:01:45 +0000 (09:01 +0100)
commit4a1e928c805dcf33fb5e1ebb0a46f634f244a9b8
tree94d683e0f1ab4aa92eef36fdf1f5beeb0aa3045d
parent5edc66c6029bd9b30cd8a2c157b7d6ab23ad0e4d
parent2a16f4e0b567f87316ab4229e0f43c27137543f7
Merge branch 'master' of git@gitorious.org:opensuse/webdesign

Conflicts:
design_concept/theme_o.o-bento-mediawiki/bento/js_local/script.js
design_concept/theme_o.o-bento/js_local/script.js