Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Sun, 16 Dec 2012 18:04:52 +0000 (19:04 +0100)
committerJens Geyer <jensg@apache.org>
Sun, 16 Dec 2012 18:04:52 +0000 (19:04 +0100)
commit716454e36ef0b80821673c6f09da08e4bc342897
treebf3c0f3a33170702254c8ca24fb156e6730f3a28
parent65d83ecf3e5350e6194a38de2a201f4ea8665ff3
parent8538edfee709db3eac7b9f85afce899299a23965
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift