Merge pull request #5 from dterweij/master

closeallinput
Merge pull request #6 from dterweij/master

Now we can use icon Sets :)
Fixed set internal param for Fedora 16 (#764)

Signed-off-by: William Leonard <william.leonard@lxcenter.org>
Fixed set internal param for Fedora 16 (#764)

Signed-off-by: William Leonard <william.leonard@lxcenter.org>
Merge branch 'master' of github.com:shazarlx/hypervm

Conflicts:
	hypervm/httpdocs/lib/vps/driver/vps__xenlib.php
Cleanup to bf7aa883175ad6bb77a0cf4a548b1059e8a5ae8e
Cleanup
Merge pull request #7 from shazarlx/master

Fixed set internal param for Fedora 16 (#764)
Added template name based pygrub support. (#269)
Added template name based pygrub support. Cleanup (#269)
Revert "Merge pull request #7 from shazarlx/master"

This reverts commit f5a43ca21f256e5761337cb4e9c20a51a2c48798, reversing
changes made to b88fc0c48935cd1f83ba6f73eef29aece4036962.
Revert "Merge pull request #7 from shazarlx/master"

This reverts commit f5a43ca21f256e5761337cb4e9c20a51a2c48798, reversing
changes made to b88fc0c48935cd1f83ba6f73eef29aece4036962.
Added template name based pygrub support. Added brackets around an if statement. (#269)
Added template name based pygrub support. Added an explanation of the $pygrub_r. (#269)
Added template name based pygrub support. Cleanup. (#269)
Merge pull request #8 from shazarlx/master

pygrub support
Merge pull request #9 from lxcenter/master

Merging to dev.  Future pull requests will go to dev first.
Fedora 16 update
Fedora 16 issue
Merge pull request #10 from shazarlx/master

Update more internal parameters for Fedora 16 and others