I am a doofus

Noticed by Andrew Stacey
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Don't escape style_additions

Credit to Andrew Stacey
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Update Maruku
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Fix two Markuku bugs
1_ Theorem numbering (reported by Andrew Stacey)
2. Section numbering (update to Nokogiri syntax)
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Ruby 1.9.3 Compatibility

Reported by pbernery and potat.
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Update SVG-Edit
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Update for itex2MML 1.4.10
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
SECURITY: Fix CVE-2012-2694 and CVE-2012-2695

Fixes for:
CVE-2012-2694 Ruby on Rails Unsafe Query Generation Risk in Ruby on Rails
CVE-2012-2695 Ruby on Rails SQL Injection
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Release Instiki 0.19.4 (SECURITY)

This is a bugfix and Security release.
In particular, it fixes CVE-2012-2694
and CVE-2012-2695.

You MUST upgrade your Instiki installation.
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
Merge branch 'instiki_0.19.4'

Conflicts:
	app/views/layouts/default.rhtml