Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 8 Mar 2012 13:37:50 +0000 (14:37 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 8 Mar 2012 13:37:50 +0000 (14:37 +0100)
commit64dd42d1ad5f70a2a2c8927b51c4a4e4f348a7b1
tree3b2278646f4f92b2b1318108678a69c543b94144
parent045705a66322ba498b110d327e8616ac7d389872
parent27154369698d4016a45237bb85269263b85ba986
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
MLDemos_variables.pri