[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9460:2151d7ebb9b4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2151d7ebb9b4
user: Kenji ITO <mystralkk at gmail.com>
date: Fri Jan 31 23:38:48 2014 +0900
description:
Merged with upstream

diffstat:

 public_html/docs/history |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 706da75a1a0a -r 2151d7ebb9b4 public_html/docs/history
--- a/public_html/docs/history	Fri Jan 31 23:36:12 2014 +0900
+++ b/public_html/docs/history	Fri Jan 31 23:38:48 2014 +0900
@@ -19,7 +19,7 @@
   now includes 1.0, 1.0a, and 2.0 (depends on what the provider supports) [Tom]
 - Javascript and css can now be loaded in a specified order. [Tom]
 - Numerous fixes for multi-language support [Tom]
-- Added CKEditor as the default advanced editor for Geeklog [Dengen]
+- Added CKEditor 4.3.2 as the default advanced editor for Geeklog [Dengen]
 - New article render which fixes entities etc... from showing up where they 
   shouldn't [Dengen]
 - New Advanced Editor System that allows developers to easily to add new 
@@ -31,6 +31,7 @@
 - Updated Hebrew language files, provided by LWC
 - jQuery can now be included in the header [Tom]
 - Updated to jQuery 1.10.2 and jQuery UI to 1.10.3 [Tom]
+- Added Filemanager [Kenji ITO]
 
 Mar 29, 2013 (2.0.0)
 ------------