Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Tue, 6 Mar 2012 16:46:14 +0000 (17:46 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Tue, 6 Mar 2012 16:46:14 +0000 (17:46 +0100)
commit5cd38763e04a8ae8345fa701af5c0ef89bc665d2
treed9934e738889aadd6bf2fb1dc910f13a8b19512e
parent3027102b50d7eae3a1b489b2fdce988e466f4669
parentfc6766d424f232929b152ff90b176c7f0822d2a3
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
MLDemos_variables.pri