Merge branch 'nikitakit_master'
authorCarlos Lopez <genetita@gmail.com>
Wed, 30 Jun 2010 16:32:09 +0000 (18:32 +0200)
committerCarlos Lopez <genetita@gmail.com>
Wed, 30 Jun 2010 16:32:09 +0000 (18:32 +0200)
commitac5caa76ff6cc25a7923c86350851a84bb40a93a
tree7405e5bfbdca840994ee23973ea0bf7e1ef8aa4b
parent8ff8c4653b08af4f9f74fee4d1e36d063f895bb7
parente7e506afaa868e76c2dfa74dd33614a9a029bb85
Merge branch 'nikitakit_master'