Merge remote branch 'remotes/origin/master' into server
authorArtem Daniliants <artem@daniliants.com>
Fri, 5 Mar 2010 13:34:18 +0000 (15:34 +0200)
committerArtem Daniliants <artem@daniliants.com>
Fri, 5 Mar 2010 13:34:18 +0000 (15:34 +0200)
commit6a5d354c744e7a91500478d77d38f6376068c892
tree8b9b58ea6e8fbf43d46901960def07a59afd6d60
parent8062481f7ee26d12aeed313ce860b1d471b4491f
parente98ee9630cb447fdaf31404d6bf2fea1e4175ae9
Merge remote branch 'remotes/origin/master' into server