Merge branch 'tg/next/1.0' into nextv0.9.0
commit1ebe33e291737eeea314f643b4bbc2e6b18e13ae
authorToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 14:03:51 +0000 (14 17:03 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 14:03:51 +0000 (14 17:03 +0300)
treeeb7e6474ca44dffc4bfa62e25af68e4a05ec9ca6
parentacff53e5f6c865ab6fa2b600f5498c6722be67c4
parenta588ad9d6b8dc10821dec706b8b4d9f9c3b82a19
Merge branch 'tg/next/1.0' into next

Conflicts:
configure.ac
.gitignore