Merge branch 'new-ui-pat' into new-ui-login
authorPatrick Aljord <patcito@gmail.com>
Mon, 20 Feb 2012 06:35:54 +0000 (01:35 -0500)
committerPatrick Aljord <patcito@gmail.com>
Mon, 20 Feb 2012 06:35:54 +0000 (01:35 -0500)
commitc8050526a7de6a913eb78f9a871d69dbd45e5290
tree553a6fdcfc423998e252d1b8672ae0eed5ec50ac
parente4e5066a3e6ce96a1c0a7dc33df6ed036619ad2f
parent1350bbae0af7da79272ba811a408e24c237ad96b
Merge branch 'new-ui-pat' into new-ui-login