Merge branch 'nikitakit_ducks'
authorCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:46:38 +0000 (10:46 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:46:38 +0000 (10:46 +0100)
commitd615bff31f340357ef81ba7cf9855df6716e4284
treea49bfb4c5268b47e6e6ba49193459433dcbdbe51
parent1a1e0c7df827bcb4b68d9781101c72a7ca64185b
parentaa9ae3cd386660a2e09c962c16894e0a58510c70
Merge branch 'nikitakit_ducks'