commit e2e0d2659bee80ed1964040778d61e0d9998d42d Merge: c1f9296 13ef143 Author: Nathan Freitas nathan@freitas.net Date: Fri May 30 10:36:58 2014 -0400

Merge branch 'hans_feature_desc'

AndroidManifest.xml | 1 + res/values/strings.xml | 1 + 2 files changed, 2 insertions(+)