Merge branch 'master' into settings_auto_update
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 31 May 2010 06:54:16 +0000 (09:54 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 31 May 2010 06:54:16 +0000 (09:54 +0300)
commit50ab86622697bde994ee5fa9f6aa6172291f42f2
tree8d83008b167e87269f2b2332a20b9258902e4e3d
parent76ac38a952f82b1004ab7da7311d59774fc30077
parent8214c2a45fc3d27c968d98a7d1baa385d51b40c2
Merge branch 'master' into settings_auto_update