merge changes from lp:mfs
commitb66ffb1f3508599ba6f10334b45548f19ad568c6
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Fri, 12 Jul 2013 07:52:06 +0000 (12 09:52 +0200)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Fri, 12 Jul 2013 07:52:06 +0000 (12 09:52 +0200)
tree0bbe8d348107431f3da4383289f091874a7b424e
parent3a67d636bfdb438974b260e16c77218777b92a3a
parentcdc3afaf697503234a75137371d2e29fba5f79a9
merge changes from lp:mfs