Merge commit 'origin/git-version'
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Mon, 4 May 2009 21:03:48 +0000 (00:03 +0300)
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Mon, 4 May 2009 21:03:48 +0000 (00:03 +0300)
commit8294883a5ecf6f6c7748c44acec64d95c8896ab8
tree56a04da6b818f934ed6d02a3fd4000fea261af84
parentc258936c4552be24660d40213b32064252750eaf
parent6de63b7ae4b59ef117b5dd1fc1ed78fc6f516905
Merge commit 'origin/git-version'
Makefile.am
configure.ac