Merge commit 'origin/bug_178_update_meta_files' into experimental
authoracid-burn <acidburn@opendreambox.org>
Wed, 25 Nov 2009 19:59:35 +0000 (20:59 +0100)
committeracid-burn <acidburn@opendreambox.org>
Wed, 25 Nov 2009 19:59:35 +0000 (20:59 +0100)
commit416240a4aeda1eb0f3e44abb2e1bb672665b363e
tree765ba5233e979ad7c23469f76900f5bbc4927f28
parent9b424161b583c7bfe5a58e979a9468101a6b6efd
parentbc6d7d587ad101a8449537238b9703f3a5fbbacb
Merge commit 'origin/bug_178_update_meta_files' into experimental