merge conflict resolution

diff --cc README
index 1d31a0a6a2e142f59dbc1837e60b37195a449d19,b5ba741f239909fa0843c209960733d7f7d2211f..1841bb616cf6cd2af6c52dcba25a5be0d44d79eb
--- 1/README
--- 2/README
+++ b/README
@@@ -122,25 -74,20 +122,23 @@@ These are the optional dependencies
  - libopus            >= 1.0.1       (for experimental conversation tool)
  - libpulse           >= 2.0         (for experimental conversation tool)
  - libogg             >= 1.3.0       (for experimental conversation tool)
 -- libnss                            (certtool binary (for convenient installation of GNS proxy))
 +- libnss                            (certtool binary (for convenient
 +                                     installation of GNS proxy))
  - libzbar            >= 0.10        (for gnunet-qr)
- - python2.7          = 2.7          (for gnunet-qr, only python 2.7
-                                      supported)
 +- libpbc             >= 0.5.14      (for Attribute-Based Encryption and
 +                                     Identity Provider functionality)
 +- libgabe                           (for Attribute-Based Encryption and
 +                                     Identity Provider functionality, from
 +                                     https://github.com/schanzen/libgabe)
 +- mandoc                            (for linting of man pages, generation of
 +                                     html output of man pages)
 +- miniupnpc
 +- perl5                             (for some utilities)
  - TeX Live           >= 2012        (for gnunet-bcd[*])
  - texi2mdoc                         (for automatic mdoc generation [*2])
 -- libglpk            >= 4.45        (for experimental code)
 -- perl5                             (for some utilities)
 -- guile              1.6.4          (or later up to 1.8?, for gnunet-download-manager)
 -- bluez                             (for bluetooth support)
 -- miniupnpc
 -- libpbc             >= 0.5.14      (for Attribute-Based Encryption and Identity Provider functionality)
 -- libgabe                           (for Attribute-Based Encryption and Identity Provider functionality,
 -                                    from https://github.com/schanzen/libgabe)
  
  Recommended autotools for compiling the Git version are:
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  - autoconf           >= 2.59
  - automake           >= 1.11.1