Merge branch 'tg/next/1.0_playlist_add_duration' into tg/next/1.0_playlist_add_properties
commit258472b0515dafdd57e7e127d6f2423c4e5bc073
authorToni Gundogdu <legatvs@gmail.com>
Thu, 2 Aug 2012 12:33:48 +0000 (2 15:33 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Thu, 2 Aug 2012 12:33:48 +0000 (2 15:33 +0300)
tree99b9c6fd39fb3cae211974b606d5125b978e2dd4
parent160bbb004f9d84d25f8c03cf3843017ea91f607f
parent498ab163d1da1bc29ce3da635ee61e37c66743da
Merge branch 'tg/next/1.0_playlist_add_duration' into tg/next/1.0_playlist_add_properties