Merge remote-tracking branch 'local_master/generic'

diff --git a/playground.spec b/playground.spec
index eef5291..3ee0874 100644 (file)
--- a/playground.spec
+++ b/playground.spec
@@ -11,11 +11,14 @@
 %define module_taglevel_varname mytaglevel
 
 %global fullversion planetlab.4.2
-%define mytaglevel 0
+%define mytaglevel 1
 %define module_current_branch 1.4
 
 # this is for testing module-tools
 %changelog
+* Thu Jun 28 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - playground-planetlab.4.2-1
+- a oneliner
+
 * Thu Jul 24 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - playground-1.4-1
 - testing taging and branching
 

diff --git a/test_avakian b/test_avakian
new file mode 100644 (file)
index 0000000..ce01362
--- /dev/null
+++ b/test_avakian
@@ -0,0 +1 @@
+hello

diff --git a/test_inria b/test_inria
new file mode 100644 (file)
index 0000000..9daeafb
--- /dev/null
+++ b/test_inria
@@ -0,0 +1 @@
+test