Merge remote-tracking branch 'origin/develop' into folderSizeInfo
authormasensio <masensio@solidgear.es>
Mon, 17 Jun 2013 11:32:40 +0000 (13:32 +0200)
committermasensio <masensio@solidgear.es>
Mon, 17 Jun 2013 11:32:40 +0000 (13:32 +0200)
commit90428ec4c79e78cc62bad1cec325c28b6f89614f
tree3a8daa499a0edf47b1a7aa57a2a157bc040b6111
parent6e2949f6816e2cb8a33cd2114a1c6cabd5371dfe
parenta65b73a97282291605f27f6082f362d9b02a2a6a
Merge remote-tracking branch 'origin/develop' into folderSizeInfo

Conflicts:
.classpath
tests/.classpath
.classpath
tests/.classpath