Merge branch 'next-gtk2'
authorHenry Gebhardt <hsggebhardt@gmail.com>
Sat, 14 Sep 2013 14:42:26 +0000 (10:42 -0400)
committerHenry Gebhardt <hsggebhardt@gmail.com>
Sat, 14 Sep 2013 14:42:26 +0000 (10:42 -0400)
commita04979c2878aff29adcd9b3fa2ba74a4ea436d47
treece2d02921a2c43e8bd0b9ce106dc24facfee68d2
parent8a05ac3dbb7a2c2bf2d217f751d08db17b2f456a
parent9282eacfb72348422382860b3365816cef838e48
Merge branch 'next-gtk2'

Conflicts:
src/plugins/volumealsa/volumealsa.c
src/misc.c
src/panel.c
src/plugins/cpu/cpu.c
src/plugins/dclock.c
src/plugins/launchbar.c
src/plugins/monitors/monitors.c
src/plugins/volumealsa/volumealsa.c