updated e.g.o link in the Readme
merged changes from 3.4 into 3.2-dev branch; must test
oops - should have accepted the pull request into the 'master' branch not gnome3.4. Merging the gnome3.4 pull request stuff back into master
added cjclavijo to extension.js
replaced a whole bunch of GConf.Client and GSettings with Meta.prefs_get_theme()
replaced a whole bunch of GConf.Client and GSettings with Meta.prefs_get_theme()
Removed PinchType.MUTTER which I just found out is the *same* as PinchType.GNOME-SHELL. Made PinchType.METACITY more robust; in 3.2/gconf it looks for /apps/metacity/general/windows/button_layout, in 3.4 it is org.gnome.desktop.wm.preferences button-layout
Merge branch 'gnome3.2-dev' of github.com:mathematicalcoffee/Gnome-Shell-Window-Buttons-Extension into gnome3.2-dev
Merge branch 'master' of github.com:mathematicalcoffee/Gnome-Shell-Window-Buttons-Extension
Merged gnome3.2-dev into master: got PinchType.METACITY properly working on GNOME 3.4/in prefs widget
updated readme
Merge branch 'master' of github.com:mathematicalcoffee/Gnome-Shell-Window-Buttons-Extension
updated readme
updated developer readme
fix graphical bug when no button are required on the left or on the right
fix a bug when minimizing a maximized window
Merge branch 'gnome3.4'

Conflicts:
	window_buttons@biox.github.com/extension.js
	window_buttons@biox.github.com/metadata.json
	window_buttons@biox.github.com/schemas/gschemas.compiled
	window_buttons@biox.github.com/schemas/org.gnome.shell.extensions.window-buttons.gschema.xml
Merge pull request #10 from deadalnix/fix_20

fix graphical bug when no button are required on the left or on the right
Merge pull request #9 from deadalnix/fix_minimize

fix a bug when minimizing a maximized window
updated readme after merging some fixes