[network-manager-applet: 2/2] ui: merge branch 'lr/bluetooth'

[Lubomir Rintel <lkundrak src gnome org>]

commit 9b292e09563368ade7797a18bd607e378dc8f70e
Merge: 9a64daf 6df2262
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Apr 15 14:12:10 2015 +0200

    ui: merge branch 'lr/bluetooth'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=737560

 src/connection-editor/connection-helpers.c |    2 +
 src/connection-editor/page-bluetooth.c     |  151 +++++++++++++++++++++++++++-
 2 files changed, 152 insertions(+), 1 deletions(-)
---