tree 5c17e58755c19d879c37df306ed614eddbdd9134
parent 224b6921bb098b2ec565d2000bb8fccbbf98577d
author Łukasz Dywicki <ldywicki@apache.org> 1313698472 +0000
committer Łukasz Dywicki <ldywicki@apache.org> 1313698472 +0000

Merge with trunk.

git-svn-id: https://svn.apache.org/repos/asf/karaf/sandbox/pieber/karaf-webconsole/trunk@1159398 13f79535-47bb-0310-9956-ffa450edef68