Merge pull request #1 from asleonardo/master.
authorGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Mon, 2 May 2011 12:10:52 +0000 (05:10 -0700)
committerGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Mon, 2 May 2011 12:10:52 +0000 (05:10 -0700)
commitbcdbcbc2a3134f81c330b1db1cb26d1f5c28b1ee
tree978f488a0c104f2ae35d0a1638f0464973d17484
parent39ebc59c70aadd6e7031bb5f5d96d64511596857
parented943b336fcd49f9da00af38ca0177aac5c03ff6
Merge pull request #1 from asleonardo/master.

"Updated CREDITS file with the link to GSoC 2010 patch"