Merge remote-tracking branch 'upstream/master' into bwm-ng 1421/head
authorJulen Landa Alustiza <julen@zokormazo.info>
Thu, 18 Jun 2015 16:48:31 +0000 (18:48 +0200)
committerJulen Landa Alustiza <julen@zokormazo.info>
Thu, 18 Jun 2015 16:48:31 +0000 (18:48 +0200)
commit480fab541af9faaf079e6ee5329d6c509c97bcdd
tree0039c1606c0636353d643226f1d34889a7be0b45
parent5aae478e24547d79cfefac0fe3562dc0b93b7f21
parentdb2eba4dc4f6958889f8664837c8c477f9808c6a
Merge remote-tracking branch 'upstream/master' into bwm-ng