Merge branch 'bestel74/add_apply_button_color_chooser'
commit9ae07905620e78da3550945f47d01f2c7ea14edb
authorColomban Wendling <ban@herbesfolles.org>
Fri, 7 Mar 2014 21:12:04 +0000 (7 22:12 +0100)
committerColomban Wendling <ban@herbesfolles.org>
Fri, 7 Mar 2014 21:12:04 +0000 (7 22:12 +0100)
tree9e394f4e9a8add2f580fcc5f0a9e40d248825968
parent717f8e1b137f7a51a78ffbf12d1c0c15b1784bc3
parent77b82845edcc796380cddc26cc4064329f0817cd
Merge branch 'bestel74/add_apply_button_color_chooser'

Closes PR #223.