Merge branch 'bookmarks' into next. This fixes #103.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 17 Feb 2011 10:30:19 +0000 (11:30 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 17 Feb 2011 10:30:19 +0000 (11:30 +0100)
commit6e98888ca9440b004c7d65786ea47c4f263de7b2
tree0a4282685c3b6520dfdc23bfa86618ee17493281
parent57e3f4a677e70fbf3b22231677d3c13fce793826
parentd34cc2c44a2fb19104988534504f2a96a9f0cb93
Merge branch 'bookmarks' into next. This fixes #103.