merge with upstream. Fixed confict in pad.html

This commit is contained in:
Jean-Tiare Le Bigot 2012-01-08 19:32:06 +01:00
parent 3248ca4cbb
commit 254046454d
91 changed files with 1674 additions and 1363 deletions

View file

@ -1,6 +1,6 @@
#!/bin/sh
NODE_VERSION="0.6.1"
NODE_VERSION="0.6.5"
#Move to the folder where ep-lite is installed
cd `dirname $0`