Merge branch 'master' into xega
tree05649e3c1d4387306c214653d79004547874b139
-rw-r--r-- 6482 account.php
drwxr-xr-x - ajax
drwxr-xr-x - appg
-rw-r--r-- 2394 categories.php
-rw-r--r-- 7381 comments.php
drwxr-xr-x - conf
-rw-r--r-- 1957 extension.php
drwxr-xr-x - extensions
-rw-r--r-- 18009 gpl.txt
drwxr-xr-x - images
-rw-r--r-- 4262 index.php
drwxr-xr-x - js
drwxr-xr-x - languages
drwxr-xr-x - library
-rw-r--r-- 2402 people.php
-rw-r--r-- 2633 post.php
-rw-r--r-- 1389 readme.html
-rw-r--r-- 2224 search.php
-rw-r--r-- 7945 settings.php
drwxr-xr-x - setup
-rw-r--r-- 2732 termsofservice.php
drwxr-xr-x - themes