]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'topic/oxygen' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 1 Dec 2009 14:56:52 +0000 (15:56 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 1 Dec 2009 14:56:52 +0000 (15:56 +0100)

Trivial merge