Makefile: fetch before getting mergebase

Change-Id: I947acea1d79f22b3fca796153afd898d0f317b37
Merge "Makefile: fetch before getting mergebase" into 1.5_STABLE
Refactor the URL and embedded code format of Google apps

(Bug #1141446)

Update new format for google apps:
1. Presentation
2. Document
3. Drawing
4. Spreadsheet
5. Form
6. Document viewer

Change-Id: I3caff706eb35867b7760576bb65b1470922ea33d
Fix stored XSS in TinyMCE editor (Bug #1153423)

This patch fixes a stored XSS in the TinyMCE editor, which could be
reproduced where the editor was present. The input was stored which
meant that any future collaborators could be affected by any malicious
payload in the XSS.

The patch works by escaping the defaultvalue of the wsyiwyg form
element, which is the value stored the database.

CVE 2013-1426

Change-Id: Iecf5f1e520e6499db5a0f78493ce119a352b6a91
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
Merge "Fix stored XSS in TinyMCE editor (Bug #1153423)" into 1.5_STABLE
Version bump for 1.5.9

Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
Version bump for 1.5.10testing

Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>