Merge branch 'master' into gtk3
authorPhilip Chimento <philip.chimento@gmail.com>
Sun, 26 Aug 2012 00:21:36 +0000 (02:21 +0200)
committerPhilip Chimento <philip.chimento@gmail.com>
Sun, 26 Aug 2012 00:21:36 +0000 (02:21 +0200)
1  2 
libchimara/Makefile.am

Simple merge