Merge remote branch 'oldgit/master'
authorJan <jan@horde.org>
Mon, 25 Oct 2010 12:02:19 +0000 (13:02 +0100)
committerJan <jan@horde.org>
Mon, 25 Oct 2010 12:02:19 +0000 (13:02 +0100)
commit30b37266754b59a8e108f71753c5a40cf089c37b
tree83e9d87e193d506c40e274b0252f19d16616178a
parent44d61f2c0e458c633805e1d9c94629982fdda3e4
parent47d11fe19400c49988b3d24fe134d3f5abe86408
Merge remote branch 'oldgit/master'

* oldgit/master:
  Remove all sounds but doorbell.
  Add links to SAPO maps.
  Add skyscraper ad.
  Add legal notice.
  No effects for SAPO.
  The Desktop handler is not production ready yet.
  Add SAPO map driver.
  Add link to SAPO calendar portal.
  Add custom help links.
  Add SAPO bar.
kronolith/js/kronolith.js
kronolith/templates/chunks/calendar.php
kronolith/templates/chunks/permissions.inc
kronolith/templates/common-header.inc
kronolith/templates/itip/notification.html.php