[shogun/f21] (2 commits) ...updated to new snapshot git20140804.96f3cf3ce58514299f98e688b7c43e057ad4fa41

[Björn 'besser82' Esser]

Summary of changes:

dad2fdd... updated to new snapshot git20140721.81c00087da6f05d36aec410 (*)
  25c6087... updated to new snapshot git20140804.96f3cf3ce58514299f98e68 (*)

(*) This commit already existed in another branch; no separate mail sent