Merge branch 'gcc_fix' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'gcc_fix' of https://github.com/pyhalov/oi-userland into oi/hipster
xscreensaver - modify Makefile POST_UNPACK to find gconf headers
Merge branch 'perl_mediator_errors' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'wdiff' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'php' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'gcc_fix' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'nginx' of https://github.com/pyhalov/oi-userland into oi/hipster
Merge branch 'gzip' of https://github.com/pyhalov/oi-userland into oi/hipster
Unbreak python-mysql. Switch default dependency to mariadb.
Actually enable python-mysql
Merge pull request #178 from pyhalov/python-mysql

Python mysql
Enable cdrtools
Enable timezone
Enable p7zip
Enable slang
Merge pull request #179 from xen0l/oi/hipster

Enable components
Merge https://github.com/OpenIndiana/oi-userland into oi/hipster
Add joe - text editor - to OI/Userland

JOE is a full featured terminal-based screen editor which is distributed under
the GNU General Public License (GPL). JOE has been around since 1988
and comes standard with many Linux distributions. Author: Joseph Allen.
Merge branch 'oi/hipster' of github.com:OpenIndiana/oi-userland into oi/hipster