Merge branch 'master' of gitorious.org:mldemos/mldemos
authorBasilio <basilio@tsf-wpa-2-5046.epfl.ch>
Thu, 24 Mar 2011 14:27:51 +0000 (15:27 +0100)
committerBasilio <basilio@tsf-wpa-2-5046.epfl.ch>
Thu, 24 Mar 2011 14:27:51 +0000 (15:27 +0100)
commitcca41cba299f11432d720e7ef7faafaa23127672
tree37acf255f725ede876271bc708ac724b7dac6d28
parentb91cd1f6111c9412e8b6508c9b5e33f692818cd3
parentbbb06e5bbd30f0909773a1cbb27a239cefe028e8
Merge branch 'master' of gitorious.org:mldemos/mldemos