Merge branch 'master' of github.com:wmvanvliet/Chimara
authorP. F. Chimento <philip.chimento@gmail.com>
Sun, 30 Jan 2011 15:41:28 +0000 (16:41 +0100)
committerP. F. Chimento <philip.chimento@gmail.com>
Sun, 30 Jan 2011 15:41:28 +0000 (16:41 +0100)
commitbf5bc4b0d129685482eefea499f39f874744e2fd
tree0e1814e67cd40041dfb2373ac5e81eed665b9cd7
parentedf59e1a751771655752b61e211053e08a8cbe3a
parenteee4d0cf128d86aaac5c81c6ac404819770c49d0
Merge branch 'master' of github.com:wmvanvliet/Chimara

Conflicts:
player/style.css
player/style.css