Merge branch 'tg/next/1.0' into nextv0.9.0
commit86bd2499f4509ec4f9a19c927b4316c87d4edf0d
authorToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 14:17:19 +0000 (14 17:17 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 14:17:19 +0000 (14 17:17 +0300)
tree39f926e53cffaea4291c5311d9bbaed3feb556eb
parentf158f9e6b942e876f5a98bb527e783eba7a9c274
parent15affa92a5e527be186dfc7b9b15ea6fa9ec9856
Merge branch 'tg/next/1.0' into next

Conflicts:
configure.ac