Merge remote-tracking branch 'origin/master' into aris
commit2b4acfa534835b7e41eaeb583c761c4312fd8488
authorAris Feryanto <aris_feryanto@yahoo.com>
Mon, 22 Aug 2011 18:26:57 +0000 (23 02:26 +0800)
committerAris Feryanto <aris_feryanto@yahoo.com>
Mon, 22 Aug 2011 18:26:57 +0000 (23 02:26 +0800)
tree1697f958ee491792128bf87d8db43e6f04c351a2
parentf82ad2318cc90bcff6e3624af704a769738e3e99
parentaf5c63a905569dfe33ad01cea8a5fc9da333e288
Merge remote-tracking branch 'origin/master' into aris