[Ssc-dev] [guardianproject/InformaCore] a6b142: Merge branch 'master' of https://github.com/guardi...

[harlo]

  Branch: refs/heads/harlo_task_3288
  Home:   https://github.com/guardianproject/InformaCore
  Commit: a6b142c0d0c589a1c8c6a148349e374f41271c75
      https://github.com/guardianproject/InformaCore/commit/a6b142c0d0c589a1c8c6a148349e374f41271c75
  Author: harlo <harlo.holmes at gmail.com>
  Date:   2014-04-23 (Wed, 23 Apr 2014)

  Changed paths:
    M .gitmodules
    A libs/spongycastle-core-1.50.0.0.jar
    M res/values/strings.xml
    M src/org/witness/informacam/informa/embed/ImageConstructor.java
    M src/org/witness/informacam/models/media/IImage.java
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/guardianproject/InformaCam into harlo_bug_3261


  Commit: a60bd2fd77aaf90251119203e2fe0363c3e73931
      https://github.com/guardianproject/InformaCore/commit/a60bd2fd77aaf90251119203e2fe0363c3e73931
  Author: harlo <harlo.holmes at gmail.com>
  Date:   2014-04-23 (Wed, 23 Apr 2014)

  Changed paths:
    M src/org/witness/informacam/Debug.java
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/storage/IOUtility.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java

  Log Message:
  -----------
  see https://dev.guardianproject.info/issues/3288


Compare: https://github.com/guardianproject/InformaCore/compare/a6b142c0d0c5^...a60bd2fd77aa