[geeklog-hg] [Geeklog-Core/geeklog] 582aba: Merge remote-tracking branch 'origin/master'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: 582aba37a9a2d7d15dda39f8373ff6a8144e414d
      https://github.com/Geeklog-Core/geeklog/commit/582aba37a9a2d7d15dda39f8373ff6a8144e414d
  Author: Kenji ITO <mystralkk at gmail.com>
  Date:   2016-09-09 (Fri, 09 Sep 2016)

  Changed paths:
    M language/english.php
    M language/english_utf-8.php
    M sql/updates/mysql_2.1.1_to_2.1.2.php
    M sql/updates/pgsql_2.1.1_to_2.1.2.php
    M system/lib-story.php
    M system/lib-template.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'