[Ssc-dev] [guardianproject/InformaCam] f3cbcd: updates for Nathan

[harlo]

  Branch: refs/heads/rc2
  Home:   https://github.com/guardianproject/InformaCam
  Commit: f3cbcdd4c8c5341b8a724d7b224b7362fd9c8127
      https://github.com/guardianproject/InformaCam/commit/f3cbcdd4c8c5341b8a724d7b224b7362fd9c8127
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M external/ODKFormParser
    M external/OnionKit
    R src/org/witness/informacam/informa/PersistentService.java
    M src/org/witness/informacam/models/j3m/IDCIMDescriptor.java
    M src/org/witness/informacam/utils/BackgroundProcessor.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  updates for Nathan


  Commit: cd45a8d0a5e6105b86a94f989be1ee189933424e
      https://github.com/guardianproject/InformaCam/commit/cd45a8d0a5e6105b86a94f989be1ee189933424e
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M .gitmodules
    A .tx/config
    M README.md
    M external/IOCipher

  Log Message:
  -----------
  Merge branch 'rc2' of github.com:guardianproject/InformaCam into rc2


Compare: https://github.com/guardianproject/InformaCam/compare/f86635fc87a9...cd45a8d0a5e6