modified:   init.el
	modified:   .gitignore
old stuff deleted
	modified:   init.el
	modified:   s9g-c.el
	modified:   s9g-configs.el
	modified:   s9g-set-hooks.el
	modified:   .gitignore
	new file:   .gitmodules
	modified:   init.el
	new file:   packages/auto-complete
	modified:   init.el
	renamed:    s9g-set-hooks.el -> s9g-configure-modes.el
	now we can load packages from one directory
	modified:   .gitignore
	modified:   .gitmodules
	new file:   packages/popup
	new file:   s9g-auto-complete.el
	modified:   s9g-configs.el
	modified:   s9g-configure-modes.el
	modified:   s9g-elisp.el
	modified:   s9g-octave.el
	modified:   s9g-python.el
	modified:   s9g-rest.el
magit installed
	modified:   .gitmodules
	new file:   packages/php-mode
	modified:   s9g-configure-modes.el
	new file:   s9g-php-mode.el
fixed
moving
fixed
	modified:   .gitmodules
	new file:   packages/haskell-mode
Merge remote-tracking branch 'origin/newconf' into newconf

Conflicts:
	.gitmodules
fixed
cedet + mmm-mode
	modified:   s9g-haskell.el
auto-fill in org-mode, column is 56