Merge branch '7.x-3.x' of github.com:ThemeGeeks/Omega into 7.x-3.x
-rw-r--r-- 2808 README.txt
-rw-r--r-- 1885 UPGRADE.txt
drwxr-xr-x - alpha
drwxr-xr-x - omega
drwxr-xr-x - starterkits