Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Thu, 26 Apr 2012 20:38:48 +0000 (22:38 +0200)
committerb4silio <b4silio@gmail.com>
Thu, 26 Apr 2012 20:38:48 +0000 (22:38 +0200)
commit3f035564003eb11e17f45fd05ffa85ed38875516
treed39c983c0d312e259a351b24cbc9af18f2732197
parent6e2e64307815d0791515a8c6b7a287a54dfcbf82
parent78baa155944ac295eaca1c91470f8c52445faaf4
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel