Merge branch 'trunk'
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/0e15a67b Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/0e15a67b Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/0e15a67b Branch: refs/heads/master Commit: 0e15a67b21662784d93a34546dc5c60e690295f4 Parents: e4609aa 81978af Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Wed Dec 18 13:21:44 2013 +0100 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Wed Dec 18 13:21:44 2013 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------