Merge branch 'upstream' of gitorious.org:canaima-gnu-linux/base-files into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'master' into upstream
Merge branch 'upstream' of gitorious.org:canaima-gnu-linux/base-files into upstream
[ canaima-desarrollador ] Los siguientes archivos han sido modificados/añadidos: .quilt_patches .quilt_series .version canaima_version canaima debian_version issue issue.net nsswitch.conf applied-patches canaima_version debian_version issue issue.net motd canaima dot.bashrc nsswitch.conf
Merge branch 'master' into upstream
Importando nueva versión Upstream 7.1wheezy3
Merge branch 'upstream'

Conflicts:
	.pc/06_motd.patch/etc/motd
	debian/changelog
	debian/control
	debian/patches/01_canaima-version.patch
	debian/patches/03_debian-version.patch
	debian/patches/04_issue.patch
	debian/patches/05_issue-net.patch
	debian/patches/06_motd.patch
	etc/debian_version
	etc/motd
	share/motd
Eliminando archivos .pc/ innecesarios
Agregando parche que se saltaron en el commit anterior
dummy
"Actualizando el parche 03_debian_version"