Merge remote-tracking branch 'origin/master' into ticket43
authoradam <adamansky@gmail.com>
Tue, 15 Jan 2013 17:35:57 +0000 (00:35 +0700)
committeradam <adamansky@gmail.com>
Tue, 15 Jan 2013 17:35:57 +0000 (00:35 +0700)
commit09c0ba1ba2a7afe58cbe023380315995a6a877a8
tree782417e307eceb27c5002cf25e87f1dece23b93a
parent66947da7e7cfb9b9e0b25f736711e735591b7269
parent4ccc82c8ece95198d4c9246044350244c039cc64
Merge remote-tracking branch 'origin/master' into ticket43