Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Sat, 15 Dec 2012 02:16:34 +0000 (03:16 +0100)
committerJens Geyer <jensg@apache.org>
Sat, 15 Dec 2012 02:16:34 +0000 (03:16 +0100)
commitce52ae7f8ecde8a9b7064ff2144a05cfe637097f
treef30171de0910c3c505e98db8902250fd5fb21371
parentad4467e9dbce19aa96967599dcec1d6885a9c0a3
parenta9e33bf0f699cd35ce2a1442a705c468b3e4ca45
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift