fixed bug #3156 in highlight_code() where PHP tags were not being converted properly.  Also added protection for asp and inline style script delimiters, and removed an empty span to make outputted code valid
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 530a612..b4c6e62 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -154,6 +154,7 @@
 	

 <ul>

 	<li>Removed an extraneous call to loading models (#3286).</li>

+	<li>Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.</li>

 	<li>Fixed a bug (#3289) in the File Helper where temp files in directories being tested with is_really_writable() were not being handled properly</li>

 	<li>Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.</li>

     <li>Fixed a bug (#3268) where the Router could leave '/' as the path.</li>